From 1a633812a7d5f6540669c536dc67ac2b06d5fd97 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 5 May 2022 17:10:06 +0100 Subject: [PATCH] DashboardSettings: Update active tab to use new brand gradient (#48755) * DashboardSettings: Update active tab to use new brand gradient * Remove colons from gradients --- packages/grafana-data/src/themes/createColors.ts | 8 ++++---- .../grafana-ui/src/themes/_variables.dark.scss.tmpl.ts | 4 ++-- .../grafana-ui/src/themes/_variables.light.scss.tmpl.ts | 4 ++-- public/sass/_variables.dark.generated.scss | 4 ++-- public/sass/_variables.light.generated.scss | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts index 134c947721a..c645630f1d3 100644 --- a/packages/grafana-data/src/themes/createColors.ts +++ b/packages/grafana-data/src/themes/createColors.ts @@ -150,8 +150,8 @@ class DarkColors implements ThemeColorsBase> { }; gradients = { - brandHorizontal: ' linear-gradient(270deg, #F55F3E 0%, #FF8833 100%);', - brandVertical: 'linear-gradient(0.01deg, #F55F3E 0.01%, #FF8833 99.99%);', + brandHorizontal: 'linear-gradient(270deg, #F55F3E 0%, #FF8833 100%)', + brandVertical: 'linear-gradient(0.01deg, #F55F3E 0.01%, #FF8833 99.99%)', }; contrastThreshold = 3; @@ -230,8 +230,8 @@ class LightColors implements ThemeColorsBase> { }; gradients = { - brandHorizontal: 'linear-gradient(90deg, #FF8833 0%, #F53E4C 100%);', - brandVertical: 'linear-gradient(0.01deg, #F53E4C -31.2%, #FF8833 113.07%);', + brandHorizontal: 'linear-gradient(90deg, #FF8833 0%, #F53E4C 100%)', + brandVertical: 'linear-gradient(0.01deg, #F53E4C -31.2%, #FF8833 113.07%)', }; contrastThreshold = 3; diff --git a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts index 50c4b052857..fd0b1aad07c 100644 --- a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts @@ -110,8 +110,8 @@ $text-shadow-faint: 1px 1px 4px rgb(45, 45, 45); $textShadow: none; // gradients -$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); -$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); +$brand-gradient-horizontal: ${theme.colors.gradients.brandHorizontal}; +$brand-gradient-vertical: ${theme.colors.gradients.brandVertical}; // Links // ------------------------- diff --git a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts index bd8887c9889..6b747eb72b7 100644 --- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts @@ -107,8 +107,8 @@ $text-blue: ${theme.v1.colors.textBlue}; $text-shadow-faint: none; // gradients -$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); -$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); +$brand-gradient-horizontal: ${theme.colors.gradients.brandHorizontal}; +$brand-gradient-vertical: ${theme.colors.gradients.brandVertical}; // Links // ------------------------- diff --git a/public/sass/_variables.dark.generated.scss b/public/sass/_variables.dark.generated.scss index 474f9c119de..2d8026af48b 100644 --- a/public/sass/_variables.dark.generated.scss +++ b/public/sass/_variables.dark.generated.scss @@ -112,8 +112,8 @@ $text-shadow-faint: 1px 1px 4px rgb(45, 45, 45); $textShadow: none; // gradients -$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); -$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); +$brand-gradient-horizontal: linear-gradient(270deg, #F55F3E 0%, #FF8833 100%); +$brand-gradient-vertical: linear-gradient(0.01deg, #F55F3E 0.01%, #FF8833 99.99%); // Links // ------------------------- diff --git a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss index e0bbb8a6371..c7022ca3136 100644 --- a/public/sass/_variables.light.generated.scss +++ b/public/sass/_variables.light.generated.scss @@ -107,8 +107,8 @@ $text-blue: #1F62E0; $text-shadow-faint: none; // gradients -$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%); -$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%); +$brand-gradient-horizontal: linear-gradient(90deg, #FF8833 0%, #F53E4C 100%); +$brand-gradient-vertical: linear-gradient(0.01deg, #F53E4C -31.2%, #FF8833 113.07%); // Links // -------------------------