root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 132 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:grafana/grafana into develop

This commit is contained in:
Torkel Ödegaard 2017-12-15 11:01:30 +01:00
parent 313d20292e c78f1834bd
commit 68ab11d7bf
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/sass/_variables.dark.scss
View File

@ -44,6 +44,8 @@ $brand-success: $green;
$brand-warning: $brand-primary; $brand-warning: $brand-primary;
$brand-danger: $red; $brand-danger: $red;
$query-blue: $blue;
// Status colors // Status colors
// ------------------------- // -------------------------
$online: #10a345; $online: #10a345;
@ -316,7 +318,8 @@ $graph-tooltip-bg: $dark-1;
$checkboxImageUrl: '../img/checkbox.png'; $checkboxImageUrl: '../img/checkbox.png';
// info box // info box
$info-box-background: linear-gradient(100deg, #1a4552, #00374a); $info-box-background: linear-gradient(100deg, $blue-dark, darken($blue-dark, 5%));
$info-box-color: $gray-4;
// footer // footer
$footer-link-color: $gray-2; $footer-link-color: $gray-2;

10
public/sass/_variables.light.scss
View File

@ -31,8 +31,8 @@ $white: #fff;
// Accent colors // Accent colors
// ------------------------- // -------------------------
$blue: #1ca4d6; $blue: #61c2f2;
$blue-dark: #3CAAD6; $blue-dark: #0083b3;
$green: #3aa655; $green: #3aa655;
$red: #d44939; $red: #d44939;
$yellow: #FF851B; $yellow: #FF851B;
@ -46,6 +46,8 @@ $brand-success: $green;
$brand-warning: $orange; $brand-warning: $orange;
$brand-danger: $red; $brand-danger: $red;
$query-blue: $blue-dark;
// Status colors // Status colors
// ------------------------- // -------------------------
$online: #01A64F; $online: #01A64F;
@ -329,8 +331,8 @@ $graph-tooltip-bg: $gray-5;
$checkboxImageUrl: '../img/checkbox_white.png'; $checkboxImageUrl: '../img/checkbox_white.png';
// info box // info box
// $info-box-background: linear-gradient(135deg, #f1fbff, #d7ebff); $info-box-background: linear-gradient(100deg, $blue-dark, darken($blue-dark, 5%));
$info-box-background: linear-gradient(135deg, $blue, $blue-dark); $info-box-color: $gray-7;
// footer // footer
$footer-link-color: $gray-3; $footer-link-color: $gray-3;

2
public/sass/base/_type.scss
View File

@ -279,7 +279,7 @@ address {
} }
a.external-link { a.external-link {
color: $blue; color: $external-link-color;
text-decoration: underline; text-decoration: underline;
} }

4
public/sass/components/_infobox.scss
View File

@ -7,6 +7,10 @@
margin-bottom: $spacer; margin-bottom: $spacer;
margin-right: $gf-form-margin; margin-right: $gf-form-margin;
flex-grow: 1; flex-grow: 1;
color: $info-box-color;
h5 {
color: $info-box-color;
}
h5 { h5 {
margin-bottom: $spacer; margin-bottom: $spacer;

6
public/sass/components/_query_editor.scss
View File

@ -1,11 +1,11 @@
.query-keyword { .query-keyword {
font-weight: $font-weight-semi-bold; font-weight: $font-weight-semi-bold;
color: $blue; color: $query-blue;
} }
.gf-form-disabled { .gf-form-disabled {
.query-keyword { .query-keyword {
color: darken($blue, 20%); color: darken($query-blue, 20%);
} }
} }
@ -63,7 +63,7 @@
} }
.gf-form-query-letter-cell-letter { .gf-form-query-letter-cell-letter {
font-weight: bold; font-weight: bold;
color: $blue; color: $query-blue;
} }
.gf-form-query-letter-cell-ds { .gf-form-query-letter-cell-ds {
color: $text-color-weak; color: $text-color-weak;