From f6cf35c4bc419ad012016dd40eb92f62f373f8f8 Mon Sep 17 00:00:00 2001 From: joneff Date: Fri, 26 Feb 2021 13:38:43 +0200 Subject: [PATCH] fix(default-theme): replace usages of darken with shade --- packages/default/scss/button/_variables.scss | 2 +- packages/default/scss/pdf-viewer/_variables.scss | 2 +- packages/default/scss/pivotgrid/_theme.scss | 8 ++------ packages/default/scss/pivotgrid/_variables.scss | 4 +--- packages/default/scss/stepper/_variables.scss | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/default/scss/button/_variables.scss b/packages/default/scss/button/_variables.scss index 1097e2cf4e1..729118a3f08 100644 --- a/packages/default/scss/button/_variables.scss +++ b/packages/default/scss/button/_variables.scss @@ -110,5 +110,5 @@ $flat-button-active-opacity: .16 !default; $flat-button-selected-opacity: .2 !default; $clear-button-text: $button-text !default; -$clear-button-hover-text: darken($body-text, 13%) !default; +$clear-button-hover-text: try-shade( $clear-button-text ) !default; $clear-button-focused-opacity: .1 !default; diff --git a/packages/default/scss/pdf-viewer/_variables.scss b/packages/default/scss/pdf-viewer/_variables.scss index c157c434fe3..5c538e26d1b 100644 --- a/packages/default/scss/pdf-viewer/_variables.scss +++ b/packages/default/scss/pdf-viewer/_variables.scss @@ -32,4 +32,4 @@ $pdf-viewer-search-dialog-matches-width: 4.5em !default; $pdf-viewer-selection-line-height: $line-height-sm !default; -$pdf-viewer-search-highlight-bg: try-darken($base-bg, 70% ) !default; +$pdf-viewer-search-highlight-bg: $body-text !default; diff --git a/packages/default/scss/pivotgrid/_theme.scss b/packages/default/scss/pivotgrid/_theme.scss index 0472e8f5e0d..ac5e552ef1d 100644 --- a/packages/default/scss/pivotgrid/_theme.scss +++ b/packages/default/scss/pivotgrid/_theme.scss @@ -66,17 +66,13 @@ } &.k-empty { - color: $pivotgrid-setting-delete-color; - } - - .k-setting-delete { - color: $pivotgrid-setting-delete-color; + color: $subtle-text; } } .k-pivot-toolbar { .k-empty { - color: $pivotgrid-setting-delete-color; + color: $subtle-text; } } diff --git a/packages/default/scss/pivotgrid/_variables.scss b/packages/default/scss/pivotgrid/_variables.scss index d109f44869f..3ae6fe03da1 100644 --- a/packages/default/scss/pivotgrid/_variables.scss +++ b/packages/default/scss/pivotgrid/_variables.scss @@ -11,10 +11,8 @@ $pivotgrid-alt-text: null !default; $pivotgrid-border: $component-border !default; $pivotgrid-chrome-border: $border-color !default; -$pivotgrid-setting-delete-color: darken($component-bg, 27%) !default; - $pivotgrid-container-bg: $component-bg !default; -$pivotgrid-row-headers-bg: darken($component-bg, 7%) !default; +$pivotgrid-row-headers-bg: try-shade( $component-bg, 1 ) !default; $pivotgrid-button-bg: null !default; $pivotgrid-button-text: null !default; diff --git a/packages/default/scss/stepper/_variables.scss b/packages/default/scss/stepper/_variables.scss index 7cf42d66ed6..62953fe29c4 100644 --- a/packages/default/scss/stepper/_variables.scss +++ b/packages/default/scss/stepper/_variables.scss @@ -68,7 +68,7 @@ $stepper-indicator-current-disabled-border: $stepper-indicator-done-disabled-bor $stepper-label-text: null !default; $stepper-label-success-text: $success !default; $stepper-label-error-text: $error !default; -$stepper-label-hover-text: darken($body-text, 13%) !default; +$stepper-label-hover-text: try-shade( $stepper-text, 2 ) !default; $stepper-label-disabled-text: $disabled-text !default; $stepper-optional-label-text: $subtle-text !default;