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

Theme: Fixing storybook theme (#33541)

Browse Source
This commit is contained in:
Torkel Ödegaard 2021-04-29 21:12:50 +02:00 committed by GitHub
parent 1cda7c5977
commit 33cfc3d9c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-data/src/themes/createComponents.ts
View File

@ -66,8 +66,8 @@ export function createComponents(colors: ThemeColors, shadows: ThemeShadows): Th
background: input.background, background: input.background,
}, },
tooltip: { tooltip: {
background: colors.background.secondary, background: colors.mode === 'light' ? '#555' : colors.background.secondary,
text: colors.text.primary, text: colors.mode === 'light' ? '#FFF' : colors.text.primary,
}, },
dashboard: { dashboard: {
background: colors.background.canvas, background: colors.background.canvas,

4
packages/grafana-ui/.storybook/storybookTheme.ts
View File

@ -21,8 +21,8 @@ const createStorybookTheme = (theme: GrafanaThemeV2) => {
fontCode: theme.typography.fontFamilyMonospace, fontCode: theme.typography.fontFamilyMonospace,
// Text colors // Text colors
textColor: theme.colors.primary.text, textColor: theme.colors.text.primary,
textInverseColor: theme.colors.primary.contrastText, textInverseColor: theme.colors.background.primary,
// Toolbar default and active colors // Toolbar default and active colors
barTextColor: theme.colors.text.primary, barTextColor: theme.colors.text.primary,

6
packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts
View File

@ -284,9 +284,9 @@ $tooltipArrowWidth: 5px;
$tooltipLinkColor: $link-color; $tooltipLinkColor: $link-color;
$graph-tooltip-bg: $dark-1; $graph-tooltip-bg: $dark-1;
$tooltipBackground: ${theme.colors.background.secondary}; $tooltipBackground: ${theme.components.tooltip.background};
$tooltipColor: ${theme.colors.text.primary}; $tooltipColor: ${theme.components.tooltip.text};
$tooltipArrowColor: ${theme.colors.background.secondary}; $tooltipArrowColor: ${theme.components.tooltip.background};
$tooltipBackgroundError: ${theme.colors.error.main}; $tooltipBackgroundError: ${theme.colors.error.main};
$tooltipShadow: ${theme.shadows.z2}; $tooltipShadow: ${theme.shadows.z2};

6
packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts
View File

@ -276,9 +276,9 @@ $alert-warning-bg: ${theme.colors.warning.main};
$alert-info-bg: ${theme.colors.warning.main}; $alert-info-bg: ${theme.colors.warning.main};
// Tooltips and popovers // Tooltips and popovers
$tooltipBackground: ${theme.colors.background.secondary}; $tooltipBackground: ${theme.components.tooltip.background};
$tooltipColor: ${theme.colors.text.primary}; $tooltipColor: ${theme.components.tooltip.text};
$tooltipArrowColor: ${theme.colors.background.secondary}; $tooltipArrowColor: ${theme.components.tooltip.background};
$tooltipBackgroundError: ${theme.colors.error.main}; $tooltipBackgroundError: ${theme.colors.error.main};
$tooltipShadow: ${theme.shadows.z2}; $tooltipShadow: ${theme.shadows.z2};

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

@ -278,9 +278,9 @@ $alert-warning-bg: #E56F00;
$alert-info-bg: #E56F00; $alert-info-bg: #E56F00;
// Tooltips and popovers // Tooltips and popovers
$tooltipBackground: #F4F5F5; $tooltipBackground: #555;
$tooltipColor: rgba(36, 41, 46, 1); $tooltipColor: #FFF;
$tooltipArrowColor: #F4F5F5; $tooltipArrowColor: #555;
$tooltipBackgroundError: #E0226E; $tooltipBackgroundError: #E0226E;
$tooltipShadow: 0px 4px 8px rgba(24, 26, 27, 0.2); $tooltipShadow: 0px 4px 8px rgba(24, 26, 27, 0.2);