From a331c7cc3876cad5dfdf092fb9f12b30047b44e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:44:28 +0000 Subject: [PATCH] Update dependency stylelint-config-sass-guidelines to v12 (#98213) * Update dependency stylelint-config-sass-guidelines to v12 * fix stylelint issues * fix indentation * update snapshots * linting... * linting... --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ashley Harrison --- package.json | 2 +- .../grafana-data/src/themes/createColors.ts | 6 +-- .../src/themes/createTypography.ts | 2 +- packages/grafana-data/src/themes/palette.ts | 46 ++++++++-------- .../uPlot/config/UPlotConfigBuilder.test.ts | 4 +- .../GraphNG/__snapshots__/utils.test.ts.snap | 4 +- .../src/themes/_variables.light.scss.tmpl.ts | 2 +- .../GraphNG/__snapshots__/utils.test.ts.snap | 4 +- .../__snapshots__/util.test.ts.snap | 18 +++---- .../VariableQueryEditor.test.tsx.snap | 2 +- .../barchart/__snapshots__/utils.test.ts.snap | 32 ++++++------ public/sass/_angular.scss | 16 +++--- public/sass/_variables.dark.generated.scss | 22 ++++---- public/sass/_variables.generated.scss | 2 +- public/sass/_variables.light.generated.scss | 50 +++++++++--------- yarn.lock | 52 ++++++++++++++++--- 16 files changed, 150 insertions(+), 114 deletions(-) diff --git a/package.json b/package.json index d565d15940c..38e9e87b487 100644 --- a/package.json +++ b/package.json @@ -231,7 +231,7 @@ "smtp-tester": "^2.1.0", "style-loader": "4.0.0", "stylelint": "16.12.0", - "stylelint-config-sass-guidelines": "11.1.0", + "stylelint-config-sass-guidelines": "12.1.0", "terser-webpack-plugin": "5.3.11", "testing-library-selector": "0.3.1", "tracelib": "1.0.1", diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts index 9db987e83a6..fd8d987a7fa 100644 --- a/packages/grafana-data/src/themes/createColors.ts +++ b/packages/grafana-data/src/themes/createColors.ts @@ -95,7 +95,7 @@ class DarkColors implements ThemeColorsBase> { border = { weak: `rgba(${this.whiteBase}, 0.12)`, - medium: `rgba(${this.whiteBase}, 0.20)`, + medium: `rgba(${this.whiteBase}, 0.2)`, strong: `rgba(${this.whiteBase}, 0.30)`, }; @@ -187,8 +187,8 @@ class LightColors implements ThemeColorsBase> { border = { weak: `rgba(${this.blackBase}, 0.12)`, - medium: `rgba(${this.blackBase}, 0.30)`, - strong: `rgba(${this.blackBase}, 0.40)`, + medium: `rgba(${this.blackBase}, 0.3)`, + strong: `rgba(${this.blackBase}, 0.4)`, }; secondary = { diff --git a/packages/grafana-data/src/themes/createTypography.ts b/packages/grafana-data/src/themes/createTypography.ts index 3f11990c0e7..25c5fa7c91b 100644 --- a/packages/grafana-data/src/themes/createTypography.ts +++ b/packages/grafana-data/src/themes/createTypography.ts @@ -53,7 +53,7 @@ export interface ThemeTypographyInput { htmlFontSize?: number; } -const defaultFontFamily = '"Inter", "Helvetica", "Arial", sans-serif'; +const defaultFontFamily = "'Inter', 'Helvetica', 'Arial', sans-serif"; const defaultFontFamilyMonospace = "'Roboto Mono', monospace"; export function createTypography(colors: ThemeColors, typographyInput: ThemeTypographyInput = {}): ThemeTypography { diff --git a/packages/grafana-data/src/themes/palette.ts b/packages/grafana-data/src/themes/palette.ts index f9d9a780688..5934e144710 100644 --- a/packages/grafana-data/src/themes/palette.ts +++ b/packages/grafana-data/src/themes/palette.ts @@ -1,5 +1,5 @@ export const palette = { - white: '#FFFFFF', + white: '#ffffff', black: '#000000', gray25: '#2c3235', @@ -8,37 +8,37 @@ export const palette = { gray05: '#111217', // old '#0b0c0e', // new from figma, - darkLayer0: '#18181A', + darkLayer0: '#18181a', darkLayer1: '#212124', darkLayer2: '#2a2a2f', // figma used #34343B but a bit too bright - darkBorder1: '#34343B', - darkBorder2: '#64646B', + darkBorder1: '#34343b', + darkBorder2: '#64646b', // Dashboard bg / layer 0 (light theme) - gray90: '#F4F5F5', + gray90: '#f4f5f5', // Card bg / layer 1 - gray100: '#F4F5F5', + gray100: '#f4f5f5', // divider line - gray80: '#D0D1D3', + gray80: '#d0d1d3', // from figma - lightBorder1: '#E4E7E7', + lightBorder1: '#e4e7e7', - blueDarkMain: '#3D71D9', // '#4165F5', - blueDarkText: '#6E9FFF', // '#58a6ff', //'#33a2e5', // '#5790FF', - redDarkMain: '#D10E5C', - redDarkText: '#FF5286', - greenDarkMain: '#1A7F4B', - greenDarkText: '#6CCF8E', - orangeDarkMain: '#FF9900', + blueDarkMain: '#3d71d9', // '#4165F5', + blueDarkText: '#6e9fff', // '#58a6ff', //'#33a2e5', // '#5790FF', + redDarkMain: '#d10e5c', + redDarkText: '#ff5286', + greenDarkMain: '#1a7f4b', + greenDarkText: '#6ccf8e', + orangeDarkMain: '#ff9900', orangeDarkText: '#fbad37', - blueLightMain: '#3871DC', - blueLightText: '#1F62E0', - redLightMain: '#E0226E', - redLightText: '#CF0E5B', - greenLightMain: '#1B855E', - greenLightText: '#0A764E', - orangeLightMain: '#FF9900', - orangeLightText: '#B5510D', + blueLightMain: '#3871dc', + blueLightText: '#1f62e0', + redLightMain: '#e0226e', + redLightText: '#cf0e5B', + greenLightMain: '#1b855e', + greenLightText: '#0a764e', + orangeLightMain: '#ff9900', + orangeLightText: '#b5510d', }; diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts index 2c381e896f4..ea7dd106c1b 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.test.ts @@ -414,7 +414,7 @@ describe('UPlotConfigBuilder', () => { "axes": [ { "filter": undefined, - "font": "12px "Inter", "Helvetica", "Arial", sans-serif", + "font": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "gap": 5, "grid": { "show": false, @@ -423,7 +423,7 @@ describe('UPlotConfigBuilder', () => { }, "incrs": undefined, "label": "test label", - "labelFont": "12px "Inter", "Helvetica", "Arial", sans-serif", + "labelFont": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "labelGap": 8, "labelSize": 20, "rotate": undefined, diff --git a/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap b/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap index 2aff27a97fa..70d8660a656 100644 --- a/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap +++ b/packages/grafana-ui/src/graveyard/GraphNG/__snapshots__/utils.test.ts.snap @@ -5,7 +5,7 @@ exports[`GraphNG utils preparePlotConfigBuilder 1`] = ` "axes": [ { "filter": undefined, - "font": "12px "Inter", "Helvetica", "Arial", sans-serif", + "font": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "gap": 5, "grid": { "show": true, @@ -33,7 +33,7 @@ exports[`GraphNG utils preparePlotConfigBuilder 1`] = ` }, { "filter": undefined, - "font": "12px "Inter", "Helvetica", "Arial", sans-serif", + "font": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "gap": 5, "grid": { "show": true, 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 a88d28df02c..2ba873ec5fb 100644 --- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts @@ -148,7 +148,7 @@ $popover-shadow: ${theme.shadows.z3}; $graph-tooltip-bg: $gray-5; $tooltipLinkColor: color.adjust($tooltipColor, $lightness: 5%); -$tooltipExternalLinkColor: #6E9FFF; +$tooltipExternalLinkColor: #6e9fff; $popover-error-bg: $red-base; $popover-help-bg: $tooltipBackground; diff --git a/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap b/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap index 3c8f6a99d86..3bb1df8de0a 100644 --- a/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap +++ b/public/app/core/components/GraphNG/__snapshots__/utils.test.ts.snap @@ -5,7 +5,7 @@ exports[`GraphNG utils preparePlotConfigBuilder 1`] = ` "axes": [ { "filter": undefined, - "font": "12px "Inter", "Helvetica", "Arial", sans-serif", + "font": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "gap": 5, "grid": { "show": true, @@ -33,7 +33,7 @@ exports[`GraphNG utils preparePlotConfigBuilder 1`] = ` }, { "filter": undefined, - "font": "12px "Inter", "Helvetica", "Arial", sans-serif", + "font": "12px 'Inter', 'Helvetica', 'Arial', sans-serif", "gap": 5, "grid": { "show": true, diff --git a/public/app/features/alerting/unified/components/rule-editor/__snapshots__/util.test.ts.snap b/public/app/features/alerting/unified/components/rule-editor/__snapshots__/util.test.ts.snap index a6154bf3fab..71e3ea44f31 100644 --- a/public/app/features/alerting/unified/components/rule-editor/__snapshots__/util.test.ts.snap +++ b/public/app/features/alerting/unified/components/rule-editor/__snapshots__/util.test.ts.snap @@ -11,7 +11,7 @@ exports[`getThresholdsForQueries should work for classic_condition 1`] = ` "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, ], @@ -32,7 +32,7 @@ exports[`getThresholdsForQueries should work for lt and gt 1`] = ` "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, ], @@ -53,7 +53,7 @@ exports[`getThresholdsForQueries should work for lt and gt 2`] = ` "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, ], @@ -70,11 +70,11 @@ exports[`getThresholdsForQueries should work for outside_range 1`] = ` "mode": "absolute", "steps": [ { - "color": "#D10E5C", + "color": "#d10e5c", "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, { @@ -82,7 +82,7 @@ exports[`getThresholdsForQueries should work for outside_range 1`] = ` "value": 0, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 10, }, ], @@ -103,7 +103,7 @@ exports[`getThresholdsForQueries should work for threshold condition 1`] = ` "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, ], @@ -124,11 +124,11 @@ exports[`getThresholdsForQueries should work for within_range 1`] = ` "value": -Infinity, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 0, }, { - "color": "#D10E5C", + "color": "#d10e5c", "value": 10, }, { diff --git a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap index d788e55c354..9deeaac0e1a 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap +++ b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap @@ -19,7 +19,7 @@ exports[`VariableQueryEditor renders correctly 1`] = `