Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/devextreme-scss/scss/widgets/fluent/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@forward "./variables";
@use "./variables" as *;
@use "sass:color";
@use "./color" as extcolor;

$color: null !default;
$mode: null !default;
Expand Down Expand Up @@ -169,7 +170,7 @@ $scrollview-pulldown-path: null !default;
}

$base-accent-hover: color.adjust($base-accent, $saturation: -4.18%, $space: hsl, $lightness: -4.71%) !default;
$base-accent-active: color.adjust($base-accent, $hue: -1deg, $saturation: -4.65%, $space: hsl, $lightness: -9.61%) !default;
$base-accent-active: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -1deg, $saturation: -4.65%, $lightness: -9.61%) !default;
$base-accent-selected: color.adjust($base-accent-active, $saturation: -2.02%, $space: hsl, $lightness: -4.71%) !default;

$base-foreground-disabled: color.adjust($base-text-color, $lightness: 60%, $space: hsl) !default;
Expand Down Expand Up @@ -222,8 +223,8 @@ $scrollview-pulldown-path: null !default;
}

$base-accent-hover: color.adjust($base-accent, $saturation: -1.67%, $space: hsl, $lightness: 5.29%) !default;
$base-accent-active: color.adjust($base-accent, $hue: -1deg, $saturation: -16.30%, $space: hsl, $lightness: -10.59%) !default;
$base-accent-selected: color.adjust($base-accent, $hue: -3deg, $saturation: -9.05%, $space: hsl, $lightness: -31.57%) !default;
$base-accent-active: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -1deg, $saturation: -16.30%, $lightness: -10.59%) !default;
$base-accent-selected: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -3deg, $saturation: -9.05%, $lightness: -31.57%) !default;

$base-text-color: rgba(255, 255, 255, 1) !default;
$base-label-color: color.adjust($base-text-color, $lightness: -40.00%, $space: hsl) !default;
Expand All @@ -249,8 +250,8 @@ $scrollview-pulldown-path: null !default;
$base-inverted-text-color: #000 !default;

$base-danger-hover: color.adjust($base-danger, $saturation: 0.44%, $space: hsl, $lightness: 7.45%) !default;
$base-danger-active: color.adjust($base-danger, $hue: 1.8deg, $saturation: -0.9%, $space: hsl, $lightness: 28.8%) !default;
$base-danger-selected: color.adjust($base-danger, $hue: 0.7deg, $saturation: 1.3%, $space: hsl, $lightness: 14.9%);
$base-danger-active: extcolor.adjust-if-not-achromatic($color: $base-danger, $hue: 1.8deg, $saturation: -0.9%, $lightness: 28.8%) !default;
$base-danger-selected: extcolor.adjust-if-not-achromatic($color: $base-danger, $hue: 0.7deg, $saturation: 1.3%, $lightness: 14.9%);

$scrollview-pulldown-path: data-uri('images/widgets/fluent/color-schemes/dark/pulldown.png') !default;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use "sass:color";
@use "../colors" as *;
@use "../color" as extcolor;

Expand All @@ -25,6 +24,6 @@ $badge-background-color-disabled: $base-background-disabled !default;
}

@if $mode == "dark" {
$badge-bg: color.adjust($base-accent, $hue: 358.4deg, $saturation: -8.6%, $space: hsl, $lightness: -26.7%) !default;
$badge-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 358.4deg, $saturation: -8.6%, $lightness: -26.7%) !default;
$badge-color: $base-text-color !default;
Comment thread
vorobey marked this conversation as resolved.
}
21 changes: 11 additions & 10 deletions packages/devextreme-scss/scss/widgets/fluent/button/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "sass:color";
@use "../sizes" as *;
@use "../colors" as *;
@use "../color" as extcolor;

// adduse

Expand Down Expand Up @@ -233,7 +234,7 @@ $button-success-outlined-selected-bg: null !default;
$button-accent-foreground-color: null !default;

@if $mode == "light" {
$button-accent-foreground-color: color.adjust($base-accent, $hue: -2deg, $saturation: -9.10%, $space: hsl, $lightness: -23.53%) !default;
$button-accent-foreground-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -2deg, $saturation: -9.10%, $lightness: -23.53%) !default;

$button-default-hover-bg: $base-accent-hover !default;
$button-default-focused-bg: $base-accent-hover !default;
Expand All @@ -246,14 +247,14 @@ $button-accent-foreground-color: null !default;
$button-success-selected-bg: color.adjust($base-success, $saturation: -0.22%, $space: hsl, $lightness: -12.16%) !default;

@if $color == "blue" {
$button-default-outlined-hover-bg: color.adjust($base-accent, $hue: 3.8deg, $saturation: -11.4%, $space: hsl, $lightness: 55.5%) !default;
$button-default-outlined-selected-bg: color.adjust($button-default-outlined-hover-bg, $hue: -1deg, $saturation: 10.40%, $space: hsl, $lightness: -5.49%) !default;
$button-default-outlined-active-bg: color.adjust($button-default-outlined-hover-bg, $hue: -1deg, $saturation: 17.00%, $space: hsl, $lightness: -17.06%) !default;
$button-default-outlined-hover-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 3.8deg, $saturation: -11.4%, $lightness: 55.5%) !default;
$button-default-outlined-selected-bg: extcolor.adjust-if-not-achromatic($color: $button-default-outlined-hover-bg, $hue: -1deg, $saturation: 10.40%, $lightness: -5.49%) !default;
$button-default-outlined-active-bg: extcolor.adjust-if-not-achromatic($color: $button-default-outlined-hover-bg, $hue: -1deg, $saturation: 17.00%, $lightness: -17.06%) !default;

$button-danger-outlined-hover-bg: color.adjust($base-danger, $hue: 1.5deg, $saturation: 0.6%, $space: hsl, $lightness: 46.7%) !default;
$button-danger-outlined-hover-bg: extcolor.adjust-if-not-achromatic($color: $base-danger, $hue: 1.5deg, $saturation: 0.6%, $lightness: 46.7%) !default;
$button-danger-outlined-focused-bg: $button-danger-outlined-hover-bg !default;
$button-danger-outlined-active-bg: color.adjust($button-danger-outlined-hover-bg, $hue: 358.9deg, $saturation: 2.2%, $space: hsl, $lightness: -13.9%) !default;
$button-danger-outlined-selected-bg: color.adjust($button-danger-outlined-active-bg, $hue: 359.1deg, $saturation: -0.6%, $space: hsl, $lightness: 7.1%) !default;
$button-danger-outlined-active-bg: extcolor.adjust-if-not-achromatic($color: $button-danger-outlined-hover-bg, $hue: 358.9deg, $saturation: 2.2%, $lightness: -13.9%) !default;
$button-danger-outlined-selected-bg: extcolor.adjust-if-not-achromatic($color: $button-danger-outlined-active-bg, $hue: 359.1deg, $saturation: -0.6%, $lightness: 7.1%) !default;

$button-success-outlined-hover-bg: color.adjust($base-success, $saturation: -29.8%, $space: hsl, $lightness: 68.8%) !default;
$button-success-outlined-focused-bg: $button-success-outlined-hover-bg !default;
Expand Down Expand Up @@ -297,7 +298,7 @@ $button-accent-foreground-color: null !default;
}

@if $mode == "dark" {
$button-accent-foreground-color: color.adjust($base-accent, $hue: 0.9deg, $saturation: -2.2%, $space: hsl, $lightness: 22.4%) !default;
$button-accent-foreground-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 0.9deg, $saturation: -2.2%, $lightness: 22.4%) !default;

$button-default-hover-bg: $base-accent-hover !default;
$button-default-focused-bg: $base-accent-hover !default;
Expand All @@ -309,10 +310,10 @@ $button-accent-foreground-color: null !default;
$button-success-active-bg: color.adjust($base-success, $saturation: 10.6%, $space: hsl, $lightness: 45.3%) !default;
$button-success-selected-bg: color.adjust($base-success, $saturation: 5.3%, $space: hsl, $lightness: 34.1%) !default;

$button-default-outlined-hover-bg: color.adjust($base-accent, $hue: 356.3deg, $saturation: -14.7%, $space: hsl, $lightness: -49.4%) !default;
$button-default-outlined-hover-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 356.3deg, $saturation: -14.7%, $lightness: -49.4%) !default;
$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: color.adjust($base-accent, $hue: -4deg, $saturation: -12.33%, $space: hsl, $lightness: -41.18%) !default;
$button-default-outlined-selected-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -4deg, $saturation: -12.33%, $lightness: -41.18%) !default;

$button-danger-outlined-color-hover: $base-danger-active !default;
$button-danger-outlined-color-active: $base-danger-active !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use "../sizes" as *;
@use "../colors" as *;
@use "../button/colors" as *;
@use "../color" as extcolor;

// adduse

Expand Down Expand Up @@ -55,7 +56,7 @@ $calendar-week-number-border-radius: 0 !default;
}

@if $mode == "dark" {
$calendar-hover-bg: color.adjust($base-accent, $hue: 358.4deg, $saturation: -8.6%, $space: hsl, $lightness: -26.7%) !default;
$calendar-hover-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 358.4deg, $saturation: -8.6%, $lightness: -26.7%) !default;
$calendar-cell-hover-border-color: $calendar-hover-bg !default;
$calendar-cell-active-bg: $base-accent-selected !default;
$calendar-cell-other-color: color.adjust($calendar-color, $lightness: -32.16%, $space: hsl) !default;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use 'sass:color';
@use '../colors' as *;
@use '../color' as extcolor;
@use '../../base/cardView/variables' as *;
@use '../../base/cardView/header_panel/variables' as *;
@use '../../base/cardView/header_panel/item/variables' as *;
Expand Down Expand Up @@ -423,8 +424,8 @@ $cardview-fluent-columnchooser--empty__message-color: null !default;
$cardview-fluent-card--focused-outline-color: $base-accent !default;

// Card - selected
$cardview-fluent-card--selected-bg-color: color.adjust($base-accent, $hue: 4deg, $saturation: -11.38%, $space: hsl, $lightness: 55.49%) !default;
$cardview-fluent-card--selected-border-color: color.adjust($base-accent, $hue: 3deg, $saturation: 2.21%, $space: hsl, $lightness: 44.31%) !default;
$cardview-fluent-card--selected-bg-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 4deg, $saturation: -11.38%, $lightness: 55.49%) !default;
$cardview-fluent-card--selected-border-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 3deg, $saturation: 2.21%, $lightness: 44.31%) !default;
$cardview-fluent-card--selected-divider-color: $cardview-fluent-card--selected-border-color !default;
$cardview-fluent-card--selected-text-color: $cardview-fluent-card-text-color !default;
$cardview-fluent-card--selected__cover-bg-color: $cardview-fluent-card__cover-bg-color !default;
Expand Down Expand Up @@ -462,11 +463,11 @@ $cardview-fluent-columnchooser--empty__message-color: null !default;
$cardview-fluent-header-panel__item--dragged-border-color: $cardview-fluent-header-panel__item-border-color !default;
$cardview-fluent-header-panel__item--dragged-text-color: $cardview-fluent-header-panel__item-text-color !default;
$cardview-fluent-header-panel__item--dragged__allowance-icon-color: $cardview-fluent-common-text-color !default;
$cardview-fluent-header-panel__item--dragged__prohibition-icon-color: color.adjust($base-danger, $hue: -4deg, $saturation: 22.80%, $space: hsl, $lightness: -9.61%) !default;
$cardview-fluent-header-panel__item--dragged__prohibition-icon-color: extcolor.adjust-if-not-achromatic($color: $base-danger, $hue: -4deg, $saturation: 22.80%, $lightness: -9.61%) !default;
$cardview-fluent-header-panel__item--dragged-box-shadow-color: rgba(0, 0, 0, 0.2) !default;

// Header panel Drop-zone
$cardview-fluent-header-panel__dropzone-bg-color: color.adjust($base-accent, $hue: 4deg, $saturation: -11.38%, $space: hsl, $lightness: 55.49%) !default;
$cardview-fluent-header-panel__dropzone-bg-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 4deg, $saturation: -11.38%, $lightness: 55.49%) !default;
$cardview-fluent-header-panel__dropzone-border-color: $base-accent !default;
$cardview-fluent-header-panel__dropzone-text-color: $base-accent !default;
$cardview-fluent-header-panel__dropzone__icon-color: $base-accent !default;
Expand Down Expand Up @@ -511,8 +512,8 @@ $cardview-fluent-columnchooser--empty__message-color: null !default;
$cardview-fluent-card--focused-outline-color: $base-accent !default;

// Card - selected
$cardview-fluent-card--selected-bg-color: color.adjust($base-accent, $hue: -4deg, $saturation: -14.69%, $space: hsl, $lightness: -49.41%) !default;
$cardview-fluent-card--selected-border-color: color.adjust($base-accent, $hue: -3deg, $saturation: -11.06%, $space: hsl, $lightness: -36.27%) !default;
$cardview-fluent-card--selected-bg-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -4deg, $saturation: -14.69%, $lightness: -49.41%) !default;
$cardview-fluent-card--selected-border-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -3deg, $saturation: -11.06%, $lightness: -36.27%) !default;
$cardview-fluent-card--selected-divider-color: $cardview-fluent-card--selected-border-color !default;
$cardview-fluent-card--selected-text-color: $cardview-fluent-card-text-color !default;
$cardview-fluent-card--selected__cover-bg-color: $cardview-fluent-card__cover-bg-color !default;
Expand Down Expand Up @@ -554,7 +555,7 @@ $cardview-fluent-columnchooser--empty__message-color: null !default;
$cardview-fluent-header-panel__item--dragged-box-shadow-color: rgba(0, 0, 0, 0.2) !default;

// Header panel Drop-zone
$cardview-fluent-header-panel__dropzone-bg-color: color.adjust($base-accent, $hue: -4deg, $saturation: -14.69%, $space: hsl, $lightness: -49.41%) !default;
$cardview-fluent-header-panel__dropzone-bg-color: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -4deg, $saturation: -14.69%, $lightness: -49.41%) !default;
$cardview-fluent-header-panel__dropzone-border-color: $base-accent !default;
$cardview-fluent-header-panel__dropzone-text-color: $base-accent !default;
$cardview-fluent-header-panel__dropzone__icon-color: $base-accent !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use "../colors" as *;
@use "../textEditor/colors" as *;
@use "../button/colors" as *;
@use "../color" as extcolor;

// adduse

Expand Down Expand Up @@ -151,7 +152,7 @@ $chat-suggestions-box-shadow: null !default;
$chat-suggestions-box-shadow: 0 4px 12px 0 color.change($base-shadow-color, $alpha: 0.04), 0 4px 24px 0 color.change($base-shadow-color, $alpha: 0.02) !default;

@if $color == "blue" {
$chat-bubble-background-color-primary: color.adjust($base-accent, $hue: 3.8deg, $saturation: -11.4%, $lightness: 55.5%, $space: hsl) !default;
$chat-bubble-background-color-primary: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 3.8deg, $saturation: -11.4%, $lightness: 55.5%) !default;
$chat-messagelist-empty-icon-background-color: color.adjust($base-bg, $lightness: -3.92%, $space: hsl) !default;
}

Expand All @@ -163,7 +164,7 @@ $chat-suggestions-box-shadow: null !default;

@if $mode == "dark" {
$chat-bubble-background-color-secondary: color.adjust($base-bg, $lightness: 7.84%, $space: hsl) !default;
$chat-bubble-background-color-primary: color.adjust($base-accent, $hue: 356.3deg, $saturation: -14.7%, $lightness: -49.4%, $space: hsl) !default;
$chat-bubble-background-color-primary: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 356.3deg, $saturation: -14.7%, $lightness: -49.4%) !default;

$chat-information-author-name-color: color.adjust($base-bg, $lightness: 43.92%, $space: hsl) !default;
$chat-information-timestamp-color: color.adjust($base-bg, $lightness: 43.92%, $space: hsl) !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use "../sizes" as *;
@use "../colors" as *;
@use "../button/colors" as *;
@use "../color" as extcolor;

// adduse

Expand Down Expand Up @@ -166,12 +167,12 @@ $datagrid-icon-link-disabled-opacity: $button-disabled-icon-opacity;

@if $mode == "light" {
@if $color == "blue"{
$datagrid-row-focused-bg: color.adjust($base-accent, $hue: 3deg, $saturation: -0.98%, $space: hsl, $lightness: 50.00%) !default;
$datagrid-row-focused-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 3deg, $saturation: -0.98%, $lightness: 50.00%) !default;
$datagrid-filter-row-background-color: color.adjust($datagrid-base-background-color, $lightness: -2%, $space: hsl) !default;
}

@if $color == "saas" {
$datagrid-row-focused-bg: color.adjust($base-accent, $hue: -1deg, $space: hsl, $lightness: 26.47%) !default;
$datagrid-row-focused-bg: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -1deg, $saturation: 0%, $lightness: 26.47%) !default;
$datagrid-filter-row-background-color: $base-typography-bg !default;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../colors" as *;
@use "sass:color";
@use "../color" as extcolor;

// adduse

Expand All @@ -9,7 +10,7 @@ $informer-info-color: $base-text-color !default;
$informer-info-background-color: null !default;

@if $mode == "light" {
$informer-error-background-color: color.adjust($base-danger, $hue: -358deg, $saturation: 0.58%, $space: hsl, $lightness: 46.67%);
$informer-error-background-color: extcolor.adjust-if-not-achromatic($color: $base-danger, $hue: -358deg, $saturation: 0.58%, $lightness: 46.67%);
$informer-info-background-color: color.adjust($base-text-color, $lightness: 74.90%, $space: hsl);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "sass:color";
@use "../sizes" as *;
@use "../colors" as *;
@use "../color" as extcolor;

// adduse

Expand All @@ -21,23 +22,23 @@ $load-indicator-animation-sparkle-bg-color3: null !default;

@if $mode == "light" {
@if $color == "blue" {
$load-indicator-inner-segment-border-color: color.adjust($load-indicator-segment-bg-color, $hue: 2.9deg, $saturation: 2.2%, $space: hsl, $lightness: 44.3%) !default;
$load-indicator-inner-segment-border-color: extcolor.adjust-if-not-achromatic($color: $load-indicator-segment-bg-color, $hue: 2.9deg, $saturation: 2.2%, $lightness: 44.3%) !default;
$load-indicator-animation-sparkle-bg-color1: $base-accent !default;
$load-indicator-animation-sparkle-bg-color2: color.adjust($base-accent, $hue: 2deg, $saturation: 2.73%, $space: hsl, $lightness: 27.25%) !default;
$load-indicator-animation-sparkle-bg-color3: color.adjust($base-accent, $hue: 3deg, $saturation: 5.61%, $space: hsl, $lightness: 38.43%) !default;
$load-indicator-animation-sparkle-bg-color2: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 2deg, $saturation: 2.73%, $lightness: 27.25%) !default;
$load-indicator-animation-sparkle-bg-color3: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: 3deg, $saturation: 5.61%, $lightness: 38.43%) !default;
}

@if $color == "saas" {
$load-indicator-inner-segment-border-color: color.mix($base-bg, $load-indicator-segment-bg-color, 68.82%) !default;
$load-indicator-animation-sparkle-bg-color1: color.adjust($base-accent, $hue: -15deg, $saturation: -14.71%, $space: hsl, $lightness: -26.47%) !default;
$load-indicator-animation-sparkle-bg-color2: color.adjust($base-accent, $hue: -12deg, $saturation: -11.98%, $space: hsl, $lightness: 0.78%) !default;
$load-indicator-animation-sparkle-bg-color3: color.adjust($base-accent, $hue: -12deg, $saturation: -9.09%, $space: hsl, $lightness: 11.96%) !default;
$load-indicator-animation-sparkle-bg-color1: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -15deg, $saturation: -14.71%, $lightness: -26.47%) !default;
$load-indicator-animation-sparkle-bg-color2: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -12deg, $saturation: -11.98%, $lightness: 0.78%) !default;
$load-indicator-animation-sparkle-bg-color3: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -12deg, $saturation: -9.09%, $lightness: 11.96%) !default;
}
}

@if $mode == "dark" {
$load-indicator-inner-segment-border-color: $base-accent-selected !default;
$load-indicator-animation-sparkle-bg-color1: color.adjust($base-accent, $saturation: -1.67%, $space: hsl, $lightness: 5.29%) !default;
$load-indicator-animation-sparkle-bg-color2: color.adjust($base-accent, $hue: -2deg, $saturation: -4.40%, $space: hsl, $lightness: -21.96%) !default;
$load-indicator-animation-sparkle-bg-color3: color.adjust($base-accent, $hue: -2deg, $saturation: -8.58%, $space: hsl, $lightness: -26.67%) !default;
$load-indicator-animation-sparkle-bg-color2: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -2deg, $saturation: -4.40%, $lightness: -21.96%) !default;
$load-indicator-animation-sparkle-bg-color3: extcolor.adjust-if-not-achromatic($color: $base-accent, $hue: -2deg, $saturation: -8.58%, $lightness: -26.67%) !default;
}
Loading
Loading