Merge branch 'master' into sivanova/bootstrap-color-fixes

SisIvanova · web-flow · commit e9a9bbdbcdbb · 2025-11-18T10:53:20.000+02:00
diff --git a/sass/themes/components/badge/_badge-theme.scss b/sass/themes/components/badge/_badge-theme.scss
@@ -81,7 +81,7 @@
             border-color: $border-color,
             border-radius: $border-radius,
             background-color: $background-color,
-            shadow: $shadow,
+            elevation: $shadow,
             size: $size,
             dot-size: $dot-size,
         )
diff --git a/sass/themes/components/bottom-nav/_bottom-nav-theme.scss b/sass/themes/components/bottom-nav/_bottom-nav-theme.scss
@@ -105,7 +105,7 @@
             icon-disabled-color: $icon-disabled-color,
             label-disabled-color: $label-disabled-color,
             border-color: $border-color,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }
diff --git a/sass/themes/components/button-group/_button-group-theme.scss b/sass/themes/components/button-group/_button-group-theme.scss
@@ -293,7 +293,7 @@
             disabled-selected-background: $disabled-selected-background,
             disabled-selected-border-color: $disabled-selected-border-color,
             border: $border,
-            shadow: $shadow,
+            elevation: $shadow,
             idle-shadow-color: $idle-shadow-color,
             selected-shadow-color: $selected-shadow-color,
         )
diff --git a/sass/themes/components/button/_button-theme.scss b/sass/themes/components/button/_button-theme.scss
@@ -222,10 +222,10 @@
 
                             shadow-color: $shadow-color,
 
-                            resting-shadow: $_resting-shadow,
-                            hover-shadow: $_hover-shadow,
-                            focus-shadow: $_focus-shadow,
-                            active-shadow: $_active-shadow,
+                            resting-elevation: $_resting-shadow,
+                            hover-elevation: $_hover-shadow,
+                            focus-elevation: $_focus-shadow,
+                            active-elevation: $_active-shadow,
 
                             disabled-background: $disabled-background,
                             disabled-foreground: $disabled-foreground,
diff --git a/sass/themes/components/button/_contained-button-theme.scss b/sass/themes/components/button/_contained-button-theme.scss
@@ -294,10 +294,10 @@
             focus-visible-border-color: $focus-visible-border-color,
             active-border-color: $active-border-color,
             shadow-color: $shadow-color,
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
-            focus-shadow: $focus-shadow,
-            active-shadow: $active-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
+            focus-elevation: $focus-shadow,
+            active-elevation: $active-shadow,
             disabled-background: $disabled-background,
             disabled-foreground: $disabled-foreground,
             disabled-icon-color: $disabled-icon-color,
diff --git a/sass/themes/components/button/_fab-button-theme.scss b/sass/themes/components/button/_fab-button-theme.scss
@@ -270,10 +270,10 @@
             focus-visible-border-color: $focus-visible-border-color,
             active-border-color: $active-border-color,
             shadow-color: $shadow-color,
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
-            focus-shadow: $focus-shadow,
-            active-shadow: $active-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
+            focus-elevation: $focus-shadow,
+            active-elevation: $active-shadow,
             disabled-background: $disabled-background,
             disabled-foreground: $disabled-foreground,
             disabled-icon-color: $disabled-icon-color,
diff --git a/sass/themes/components/button/_flat-button-theme.scss b/sass/themes/components/button/_flat-button-theme.scss
@@ -329,10 +329,10 @@
             focus-visible-border-color: $focus-visible-border-color,
             active-border-color: $active-border-color,
             shadow-color: $shadow-color,
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
-            focus-shadow: $focus-shadow,
-            active-shadow: $active-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
+            focus-elevation: $focus-shadow,
+            active-elevation: $active-shadow,
             disabled-background: $disabled-background,
             disabled-foreground: $disabled-foreground,
             disabled-icon-color: $disabled-icon-color,
diff --git a/sass/themes/components/button/_outlined-button-theme.scss b/sass/themes/components/button/_outlined-button-theme.scss
@@ -395,10 +395,10 @@
             focus-visible-border-color: $focus-visible-border-color,
             active-border-color: $active-border-color,
             shadow-color: $shadow-color,
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
-            focus-shadow: $focus-shadow,
-            active-shadow: $active-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
+            focus-elevation: $focus-shadow,
+            active-elevation: $active-shadow,
             disabled-background: $disabled-background,
             disabled-foreground: $disabled-foreground,
             disabled-icon-color: $disabled-icon-color,
diff --git a/sass/themes/components/card/_card-theme.scss b/sass/themes/components/card/_card-theme.scss
@@ -96,8 +96,8 @@
             subtitle-text-color: $subtitle-text-color,
             content-text-color: $content-text-color,
             actions-text-color: $actions-text-color,
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
         )
     );
 }
diff --git a/sass/themes/components/carousel/_carousel-theme.scss b/sass/themes/components/carousel/_carousel-theme.scss
@@ -212,7 +212,7 @@
             slide-background: $slide-background,
 
             border-radius: $border-radius,
-            button-shadow: $button-shadow,
+            button-elevation: $button-shadow,
 
             button-background: $button-background,
             button-disabled-background: $button-disabled-background,
diff --git a/sass/themes/components/chip/_chip-theme.scss b/sass/themes/components/chip/_chip-theme.scss
@@ -247,7 +247,7 @@
             focus-selected-background: $focus-selected-background,
             focus-selected-border-color: $focus-selected-border-color,
 
-            ghost-shadow: $ghost-shadow,
+            ghost-elevation: $ghost-shadow,
             remove-icon-color: $remove-icon-color,
             remove-icon-color-focus: $remove-icon-color-focus,
             focus-selected-outline-color: $focus-selected-outline-color,
diff --git a/sass/themes/components/dialog/_dialog-theme.scss b/sass/themes/components/dialog/_dialog-theme.scss
@@ -76,7 +76,7 @@
             background: $background,
             title-color: $title-color,
             message-color: $message-color,
-            shadow: $shadow,
+            elevation: $shadow,
             border-color: $border-color,
         )
     );
diff --git a/sass/themes/components/drop-down/_drop-down-theme.scss b/sass/themes/components/drop-down/_drop-down-theme.scss
@@ -211,7 +211,7 @@
             selected-focus-item-text-color: $selected-focus-item-text-color,
             disabled-item-background: $disabled-item-background,
             disabled-item-text-color: $disabled-item-text-color,
-            shadow: $shadow,
+            elevation: $shadow,
             border-color: $border-color,
             border-width: $border-width,
             size: $size,
diff --git a/sass/themes/components/grid/_grid-theme.scss b/sass/themes/components/grid/_grid-theme.scss
@@ -569,8 +569,8 @@
             tree-selected-filtered-cell-text-color: $tree-selected-filtered-cell-text-color,
 
             row-highlight: $row-highlight,
-            grid-shadow: $grid-shadow,
-            drag-shadow: $drag-shadow,
+            grid-elevation: $grid-shadow,
+            drag-elevation: $drag-shadow,
             row-ghost-background: $row-ghost-background,
             row-drag-color: $row-drag-color,
             drop-area-border-radius: $drop-area-border-radius,
diff --git a/sass/themes/components/input/_input-theme.scss b/sass/themes/components/input/_input-theme.scss
@@ -517,9 +517,9 @@
             border-disabled-background: $border-disabled-background,
             search-background: $search-background,
             search-disabled-background: $search-disabled-background,
-            search-resting-shadow: $search-resting-shadow,
-            search-hover-shadow: $search-hover-shadow,
-            search-disabled-shadow: $search-disabled-shadow,
+            search-resting-elevation: $search-resting-shadow,
+            search-hover-elevation: $search-hover-shadow,
+            search-disabled-elevation: $search-disabled-shadow,
             success-secondary-color: $success-secondary-color,
             warning-secondary-color: $warning-secondary-color,
             error-secondary-color: $error-secondary-color,
diff --git a/sass/themes/components/navbar/_navbar-theme.scss b/sass/themes/components/navbar/_navbar-theme.scss
@@ -95,7 +95,7 @@
             text-color: $text-color,
             idle-icon-color: $idle-icon-color,
             hover-icon-color: $hover-icon-color,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }
diff --git a/sass/themes/components/navdrawer/_navdrawer-theme.scss b/sass/themes/components/navdrawer/_navdrawer-theme.scss
@@ -147,7 +147,7 @@
             item-hover-icon-color: $item-hover-icon-color,
             item-disabled-text-color: $item-disabled-text-color,
             item-disabled-icon-color: $item-disabled-icon-color,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }
diff --git a/sass/themes/components/snackbar/_snackbar-theme.scss b/sass/themes/components/snackbar/_snackbar-theme.scss
@@ -70,7 +70,7 @@
             background: $background,
             text-color: $text-color,
             button-color: $button-color,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }
diff --git a/sass/themes/components/switch/_switch-theme.scss b/sass/themes/components/switch/_switch-theme.scss
@@ -263,9 +263,9 @@
             label-hover-color: $label-hover-color,
             label-disabled-color: $label-disabled-color,
 
-            resting-shadow: $resting-shadow,
-            hover-shadow: $hover-shadow,
-            disabled-shadow: $disabled-shadow,
+            resting-elevation: $resting-shadow,
+            hover-elevation: $hover-shadow,
+            disabled-elevation: $disabled-shadow,
 
             border-radius-track: $border-radius-track,
             border-radius-thumb: $border-radius-thumb,
diff --git a/sass/themes/components/time-picker/_time-picker-theme.scss b/sass/themes/components/time-picker/_time-picker-theme.scss
@@ -156,8 +156,8 @@
             header-background: $header-background,
             header-hour-text-color: $header-hour-text-color,
             background-color: $background-color,
-            modal-shadow: $modal-shadow,
-            dropdown-shadow: $dropdown-shadow,
+            modal-elevation: $modal-shadow,
+            dropdown-elevation: $dropdown-shadow,
             border-radius: $border-radius,
             border-color: $border-color,
             divider-color: $divider-color,
diff --git a/sass/themes/components/toast/_toast-theme.scss b/sass/themes/components/toast/_toast-theme.scss
@@ -69,7 +69,7 @@
             border-radius: $border-radius,
             text-color: $text-color,
             border-color: $border-color,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }
diff --git a/sass/themes/components/tooltip/_tooltip-theme.scss b/sass/themes/components/tooltip/_tooltip-theme.scss
@@ -62,7 +62,7 @@
             background: $background,
             text-color: $text-color,
             border-radius: $border-radius,
-            shadow: $shadow,
+            elevation: $shadow,
         )
     );
 }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	`border-color: $border-color,`
`82`	`82`	`border-radius: $border-radius,`
`83`	`83`	`background-color: $background-color,`
`84`		`- shadow: $shadow,`
	`84`	`+ elevation: $shadow,`
`85`	`85`	`size: $size,`
`86`	`86`	`dot-size: $dot-size,`
`87`	`87`	`)`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`icon-disabled-color: $icon-disabled-color,`
`106`	`106`	`label-disabled-color: $label-disabled-color,`
`107`	`107`	`border-color: $border-color,`
`108`		`- shadow: $shadow,`
	`108`	`+ elevation: $shadow,`
`109`	`109`	`)`
`110`	`110`	`);`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@`
`293`	`293`	`disabled-selected-background: $disabled-selected-background,`
`294`	`294`	`disabled-selected-border-color: $disabled-selected-border-color,`
`295`	`295`	`border: $border,`
`296`		`- shadow: $shadow,`
	`296`	`+ elevation: $shadow,`
`297`	`297`	`idle-shadow-color: $idle-shadow-color,`
`298`	`298`	`selected-shadow-color: $selected-shadow-color,`
`299`	`299`	`)`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@`
`96`	`96`	`subtitle-text-color: $subtitle-text-color,`
`97`	`97`	`content-text-color: $content-text-color,`
`98`	`98`	`actions-text-color: $actions-text-color,`
`99`		`- resting-shadow: $resting-shadow,`
`100`		`- hover-shadow: $hover-shadow,`
	`99`	`+ resting-elevation: $resting-shadow,`
	`100`	`+ hover-elevation: $hover-shadow,`
`101`	`101`	`)`
`102`	`102`	`);`
`103`	`103`	`}`