Skip to content

Commit

Permalink
Fluent: fix color of hour and minute arrows (#25932)
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeniyKiyashko authored Oct 31, 2023
1 parent 8425eb9 commit e5d17f5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions packages/devextreme/scss/widgets/fluent/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ $scrollview-pulldown-path: null !default;

$base-separator-color: $base-border-color !default; // #E0E0E0

$base-inverted-bg: rgba(235, 243, 252, 1) !default; // #EBF3FC
$base-shadow-color: #000 !default;
$base-inverted-bg: darken($base-bg, 100%) !default; // #EBF3FC
$base-shadow-color: $base-inverted-bg !default;
$base-inverted-text-color: #fff !default;

$base-danger: rgba(209, 52, 56, 1) !default; // #d13438
Expand Down Expand Up @@ -185,7 +185,7 @@ $scrollview-pulldown-path: null !default;

$base-separator-color: darken($base-border-color, 5.88) !default; // #525252

$base-inverted-bg: rgba(8, 35, 56, 1) !default; // #082338
$base-inverted-bg: lighten($base-bg, 100%) !default;
$base-shadow-color: #000 !default;
$base-inverted-text-color: #000 !default;

Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme/scss/widgets/fluent/button/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ $button-accent-foreground-color: null !default;
$button-default-active-bg: $base-accent-active !default;
$button-default-selected-bg: $base-accent-selected !default;

$button-default-outlined-hover-bg: $base-inverted-bg !default;
$button-default-outlined-focused-bg: $base-inverted-bg !default;
$button-default-outlined-hover-bg: lighten(desaturate(adjust-hue($base-accent, 3.8), 11.4), 55.5) !default; // #EBF3FC
$button-default-outlined-focused-bg: $button-default-outlined-hover-bg !default;
$button-default-outlined-active-bg: darken(saturate(adjust-hue($button-default-outlined-hover-bg, -1), 17.00), 17.06) !default;
$button-default-outlined-selected-bg: darken(saturate(adjust-hue($button-default-outlined-hover-bg, -1), 10.40), 5.49) !default;

Expand All @@ -227,7 +227,7 @@ $button-accent-foreground-color: null !default;
$button-danger-outlined-selected-color: $base-danger-selected !default;

$button-danger-outlined-hover-bg: lighten(saturate(adjust-hue($base-danger, 1.5), 0.6), 46.7) !default; // #FDF6F6
$button-danger-outlined-focused-bg: $button-danger-outlined-hover-bg !default; // #FDF6F6
$button-danger-outlined-focused-bg: $button-danger-outlined-hover-bg !default;
$button-danger-outlined-active-bg: darken(saturate(adjust-hue($button-danger-outlined-hover-bg, 358.9), 2.2), 13.9) !default; // #F1BBBC
$button-danger-outlined-selected-bg: lighten(desaturate(adjust-hue($button-danger-outlined-active-bg, 359.1), 0.6), 7.1) !default; // #F7D9DA

Expand All @@ -252,16 +252,16 @@ $button-accent-foreground-color: null !default;
}

@if $mode == "dark" {
$button-accent-foreground-color: lighten(desaturate(adjust-hue($base-accent, 0.9), 2.2), 22.4) !default; // #b4d6fa
$button-accent-foreground-color: lighten(desaturate(adjust-hue($base-accent, 0.9), 2.2), 22.4) !default; // #B4D6FA

$button-default-bg: $base-accent !default;
$button-default-hover-bg: $base-accent-hover !default;
$button-default-focused-bg: $base-accent-hover !default;
$button-default-active-bg: $button-accent-foreground-color !default;
$button-default-selected-bg: lighten(desaturate($button-default-active-bg, 6.4), 5.3) !default; // #CFE4FA

$button-default-outlined-hover-bg: $base-inverted-bg !default;
$button-default-outlined-focused-bg: $base-inverted-bg !default;
$button-default-outlined-hover-bg: darken(desaturate(adjust-hue($base-accent, 356.3), 14.7), 49.4) !default; // #082338
$button-default-outlined-focused-bg: $button-default-outlined-hover-bg !default;
$button-default-outlined-active-bg: $base-accent-selected !default;
$button-default-outlined-selected-bg: darken(desaturate(adjust-hue($base-accent-bg, -3), 3.75), 14.51) !default; // #0C3B5E

Expand Down

0 comments on commit e5d17f5

Please sign in to comment.