Skip to content

Commit 5a8da02

Browse files
committed
refactor: improve elevation system
1 parent 095284b commit 5a8da02

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

scss/_app.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
background-color: themes-get-value("body-bg");
88

99
--color: #{themes-get-value("body-color")};
10+
--elevation-base-color: #{themes-get-value("elevation-base-color")};
1011
}
1112
}

scss/mixins/_elevation.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
@mixin add-elevation($level, $direction: false) {
22
border: 0;
3+
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
4+
box-shadow: str-replace(unquote(map-get($elevations, $level)), 'var(--elevation-base-color)', $elevation-base-color);
5+
}
36
box-shadow: unquote(map-get($elevations, $level));
47

58
@if $direction == "bottom" {

scss/variables/_body.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
$body-bg: $gray-100 !default;
66
$body-color: $gray-base !default;
7+
$elevation-base-color: 60, 75, 100 !default; //#3c4b64
78

89
$body-theme-map: () !default;
910
// stylelint-disable-next-line scss/dollar-variable-default
1011
$body-theme-map: map-merge(
1112
(
1213
default: (
1314
"body-bg": $body-bg,
14-
"body-color": $body-color
15+
"body-color": $body-color,
16+
"elevation-base-color": $elevation-base-color
1517
)
1618
),
1719
$body-theme-map

scss/variables/_elevation.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
$elevations: (
66
0: "none",
7-
1: "0 1px 1px 0 rgba(60, 75, 100, .14), 0 2px 1px -1px rgba(60, 75, 100, .12), 0 1px 3px 0 rgba(60, 75, 100, .20)",
8-
2: "0 2px 2px 0 rgba(60, 75, 100, .14), 0 3px 1px -2px rgba(60, 75, 100, .12), 0 1px 5px 0 rgba(60, 75, 100, .20)",
9-
3: "0 3px 4px 0 rgba(60, 75, 100, .14), 0 3px 3px -2px rgba(60, 75, 100, .12), 0 1px 8px 0 rgba(60, 75, 100, .20)",
10-
4: "0 4px 5px 0 rgba(60, 75, 100, .14), 0 1px 10px 0 rgba(60, 75, 100, .12), 0 2px 4px -1px rgba(60, 75, 100, .20)",
11-
6: "0 6px 10px 0 rgba(60, 75, 100, .14), 0 1px 18px 0 rgba(60, 75, 100, .12), 0 3px 5px -1px rgba(60, 75, 100, .20)",
12-
8: "0 8px 10px 1px rgba(60, 75, 100, .14), 0 3px 14px 2px rgba(60, 75, 100, .12), 0 5px 5px -3px rgba(60, 75, 100, .20)",
13-
9: "0 9px 12px 1px rgba(60, 75, 100, .14), 0 3px 16px 2px rgba(60, 75, 100, .12), 0 5px 6px -3px rgba(60, 75, 100, .20)",
14-
12: "0 12px 17px 2px rgba(60, 75, 100, .14), 0 5px 22px 4px rgba(60, 75, 100, .12), 0 7px 8px -4px rgba(60, 75, 100, .20)",
15-
16: "0 16px 24px 2px rgba(60, 75, 100, .14), 0 6px 30px 5px rgba(60, 75, 100, .12), 0 8px 10px -5px rgba(60, 75, 100, .20)",
16-
24: "0 24px 38px 3px rgba(60, 75, 100, .14), 0 9px 46px 8px rgba(60, 75, 100, .12), 0 11px 15px -7px rgba(60, 75, 100, .20)"
7+
1: "0 1px 1px 0 rgba(var(--elevation-base-color), .14), 0 2px 1px -1px rgba(var(--elevation-base-color), .12), 0 1px 3px 0 rgba(var(--elevation-base-color), .20)",
8+
2: "0 2px 2px 0 rgba(var(--elevation-base-color), .14), 0 3px 1px -2px rgba(var(--elevation-base-color), .12), 0 1px 5px 0 rgba(var(--elevation-base-color), .20)",
9+
3: "0 3px 4px 0 rgba(var(--elevation-base-color), .14), 0 3px 3px -2px rgba(var(--elevation-base-color), .12), 0 1px 8px 0 rgba(var(--elevation-base-color), .20)",
10+
4: "0 4px 5px 0 rgba(var(--elevation-base-color), .14), 0 1px 10px 0 rgba(var(--elevation-base-color), .12), 0 2px 4px -1px rgba(var(--elevation-base-color), .20)",
11+
6: "0 6px 10px 0 rgba(var(--elevation-base-color), .14), 0 1px 18px 0 rgba(var(--elevation-base-color), .12), 0 3px 5px -1px rgba(var(--elevation-base-color), .20)",
12+
8: "0 8px 10px 1px rgba(var(--elevation-base-color), .14), 0 3px 14px 2px rgba(var(--elevation-base-color), .12), 0 5px 5px -3px rgba(var(--elevation-base-color), .20)",
13+
9: "0 9px 12px 1px rgba(var(--elevation-base-color), .14), 0 3px 16px 2px rgba(var(--elevation-base-color), .12), 0 5px 6px -3px rgba(var(--elevation-base-color), .20)",
14+
12: "0 12px 17px 2px rgba(var(--elevation-base-color), .14), 0 5px 22px 4px rgba(var(--elevation-base-color), .12), 0 7px 8px -4px rgba(var(--elevation-base-color), .20)",
15+
16: "0 16px 24px 2px rgba(var(--elevation-base-color), .14), 0 6px 30px 5px rgba(var(--elevation-base-color), .12), 0 8px 10px -5px rgba(var(--elevation-base-color), .20)",
16+
24: "0 24px 38px 3px rgba(var(--elevation-base-color), .14), 0 9px 46px 8px rgba(var(--elevation-base-color), .12), 0 11px 15px -7px rgba(var(--elevation-base-color), .20)"
1717
) !default;

0 commit comments

Comments
 (0)