IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Graph: Fixed series legend color for hidden series (#16438)

Browse Source 
* replaced colors for headingColor, link and linkDisabled with colors from grayscale, replaced colors for linkDisabled and linkHover with colors from grayscale, changed color for sha-modal-in-text to text-color-empahises

* fixed snapshot
This commit is contained in:
Patrick O'Carroll 2019-04-08 10:52:00 +02:00 committed by Torkel Ödegaard
parent 9630d812b8
commit 70dcb6a22a
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
View File

@ -148,10 +148,10 @@ exports[`Render should render with base threshold 1`] = `
"grayBlue": "#212327",
"greenBase": "#299c46",
"greenShade": "#23843b",
"headingColor": "#e3e3e3",
"headingColor": "#d8d9da",
"inputBlack": "#09090b",
"link": "#e3e3e3",
"linkDisabled": "#e3e3e3",
"link": "#d8d9da",
"linkDisabled": "#8e8e8e",
"linkExternal": "#33b5e5",
"linkHover": "#ffffff",
"online": "#299c46",
@ -311,10 +311,10 @@ exports[`Render should render with base threshold 1`] = `
"grayBlue": "#212327",
"greenBase": "#299c46",
"greenShade": "#23843b",
"headingColor": "#e3e3e3",
"headingColor": "#d8d9da",
"inputBlack": "#09090b",
"link": "#e3e3e3",
"linkDisabled": "#e3e3e3",
"link": "#d8d9da",
"linkDisabled": "#8e8e8e",
"linkExternal": "#33b5e5",
"linkHover": "#ffffff",
"online": "#299c46",

7
packages/grafana-ui/src/themes/dark.ts
View File

@ -1,4 +1,3 @@
import tinycolor from 'tinycolor2';
import defaultTheme from './default';
import { GrafanaTheme, GrafanaThemeType } from '../types/theme';
@ -66,11 +65,11 @@ const darkTheme: GrafanaTheme = {
textWeak: basicColors.gray2,
textEmphasis: basicColors.gray5,
textFaint: basicColors.dark5,
link: new tinycolor(basicColors.white).darken(11).toString(),
linkDisabled: new tinycolor(basicColors.white).darken(11).toString(),
link: basicColors.gray4,
linkDisabled: basicColors.gray2,
linkHover: basicColors.white,
linkExternal: basicColors.blue,
headingColor: new tinycolor(basicColors.white).darken(11).toString(),
headingColor: basicColors.gray4,
},
background: {
dropdown: basicColors.dark3,

5
packages/grafana-ui/src/themes/light.ts
View File

@ -1,4 +1,3 @@
import tinycolor from 'tinycolor2';
import defaultTheme from './default';
import { GrafanaTheme, GrafanaThemeType } from '../types/theme';
@ -68,8 +67,8 @@ const lightTheme: GrafanaTheme = {
textEmphasis: basicColors.dark5,
textFaint: basicColors.dark4,
link: basicColors.gray1,
linkDisabled: new tinycolor(basicColors.gray1).lighten(30).toString(),
linkHover: new tinycolor(basicColors.gray1).darken(20).toString(),
linkDisabled: basicColors.gray3,
linkHover: basicColors.dark1,
linkExternal: basicColors.blueLight,
headingColor: basicColors.gray1,
},

6
public/sass/_variables.dark.generated.scss
View File

@ -102,14 +102,14 @@ $edit-gradient: linear-gradient(180deg, $dark-2 50%, $input-black);
// Links
// -------------------------
$link-color: #e3e3e3;
$link-color-disabled: #e3e3e3;
$link-color: #d8d9da;
$link-color-disabled: #8e8e8e;
$link-hover-color: #ffffff;
$external-link-color: #33b5e5;
// Typography
// -------------------------
$headings-color: #e3e3e3;
$headings-color: #d8d9da;
$abbr-border-color: $gray-2 !default;
$text-muted: $text-color-weak;

4
public/sass/_variables.light.generated.scss
View File

@ -89,8 +89,8 @@ $edit-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);
// Links
// -------------------------
$link-color: #52545c;
$link-color-disabled: #9ea0a9;
$link-hover-color: #222326;
$link-color-disabled: #acb6bf;
$link-hover-color: #1e2028;
$external-link-color: #5794f2;
// Typography

2
public/sass/components/_modals.scss
View File

@ -153,7 +153,7 @@
.share-modal-info-text {
margin-top: 5px;
strong {
color: $headings-color;
color: $text-color-emphasis;
font-weight: 500;
}
}