Skip to content

Commit 5860d52

Browse files
committed
refactor(Sidebar): improve SCSS variables
1 parent c4d5b8e commit 5860d52

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

scss/_variables.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ $sidebar-nav-link-icon-bullet-border-width: 1px !default;
18981898
$sidebar-nav-link-icon-bullet-border-color: var(--#{$prefix}tertiary-color) !default;
18991899
$sidebar-nav-link-icon-bullet-border-radius: 50rem !default;
19001900

1901-
$sidebar-nav-link-hover-color: var(--#{$prefix}emphasis-color) !default;
1901+
$sidebar-nav-link-hover-color: rgba(255, 255, 255, 1) !default;
19021902
$sidebar-nav-link-hover-bg: var(--#{$prefix}tertiary-bg) !default;
19031903
$sidebar-nav-link-hover-icon-color: var(--#{$prefix}body-color) !default;
19041904
$sidebar-nav-link-hover-icon-bullet-bg: transparent !default;
@@ -1938,8 +1938,9 @@ $sidebar-toggler-width: .5rem !default;
19381938
$sidebar-toggler-height: .5rem !default;
19391939
$sidebar-toggler-padding-x: .25rem !default;
19401940
$sidebar-toggler-padding-y: .25rem !default;
1941+
$sidebar-toggler-bg: transparent !default;
19411942
$sidebar-toggler-color: var(--#{$prefix}tertiary-color) !default;
1942-
$sidebar-toggler-bg: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cg xmlns='http://www.w3.org/2000/svg' transform='matrix(-1 0 0 -1 512 512)'%3E%3Cpath fill='%23000' d='M472,16H40A24.028,24.028,0,0,0,16,40V200H48V48H464V464H48V304H16V472a24.028,24.028,0,0,0,24,24H472a24.028,24.028,0,0,0,24-24V40A24.028,24.028,0,0,0,472,16Z'/%3E%3Cpolygon fill='%23000' points='209.377 363.306 232.004 385.933 366.627 251.31 232.004 116.687 209.377 139.313 305.374 235.311 16 235.311 16 267.311 305.372 267.311 209.377 363.306'/%3E%3C/g%3E%3C/svg%3E") !default;
1943+
$sidebar-toggler-icon: url("data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3Cg xmlns='http://www.w3.org/2000/svg' transform='matrix(-1 0 0 -1 512 512)'%3E%3Cpath fill='%23000' d='M472,16H40A24.028,24.028,0,0,0,16,40V200H48V48H464V464H48V304H16V472a24.028,24.028,0,0,0,24,24H472a24.028,24.028,0,0,0,24-24V40A24.028,24.028,0,0,0,472,16Z'/%3E%3Cpolygon fill='%23000' points='209.377 363.306 232.004 385.933 366.627 251.31 232.004 116.687 209.377 139.313 305.374 235.311 16 235.311 16 267.311 305.372 267.311 209.377 363.306'/%3E%3C/g%3E%3C/svg%3E") !default;
19431944
$sidebar-toggler-focus-shadow: $focus-ring-box-shadow !default;
19441945
$sidebar-toggler-hover-color: var(--#{$prefix}secondary-color) !default;
19451946
$sidebar-toggler-focus-color: var(--#{$prefix}secondary-color) !default;

scss/sidebar/_sidebar-nav.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
--#{$prefix}sidebar-nav-group-border-color: #{$sidebar-nav-group-border-color};
5252
--#{$prefix}sidebar-nav-group-items-padding-y: #{$sidebar-nav-group-items-padding-y};
5353
--#{$prefix}sidebar-nav-group-items-padding-x: #{$sidebar-nav-group-items-padding-x};
54-
--#{$prefix}sidebar-nav-group-indicator-color: #{escape-svg($sidebar-nav-group-indicator-color)};
54+
--#{$prefix}sidebar-nav-group-indicator-color: #{$sidebar-nav-group-indicator-color};
5555
--#{$prefix}sidebar-nav-group-indicator-icon: #{escape-svg($sidebar-nav-group-indicator-icon)};
56-
--#{$prefix}sidebar-nav-group-indicator-hover-color: #{escape-svg($sidebar-nav-group-indicator-hover-color)};
56+
--#{$prefix}sidebar-nav-group-indicator-hover-color: #{$sidebar-nav-group-indicator-hover-color};
5757
--#{$prefix}sidebar-nav-group-indicator-hover-icon: #{escape-svg($sidebar-nav-group-indicator-hover-icon)};
5858
--#{$prefix}sidebar-nav-group-toggle-show-color: #{$sidebar-nav-group-toggle-show-color};
5959
// scss-docs-end sidebar-nav-css-vars

scss/sidebar/_sidebar.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,9 @@
213213
// scss-docs-start sidebar-toggler-css-vars
214214
--#{$prefix}sidebar-toggler-width: #{$sidebar-toggler-width};
215215
--#{$prefix}sidebar-toggler-height: #{$sidebar-toggler-height};
216+
--#{$prefix}sidebar-toggler-bg: #{$sidebar-toggler-bg};
216217
--#{$prefix}sidebar-toggler-color: #{$sidebar-toggler-color};
217-
--#{$prefix}sidebar-toggler-bg: #{escape-svg($sidebar-toggler-bg)};
218+
--#{$prefix}sidebar-toggler-icon: #{escape-svg($sidebar-toggler-icon)};
218219
--#{$prefix}sidebar-toggler-hover-color: #{$sidebar-toggler-hover-color};
219220
--#{$prefix}sidebar-toggler-focus-shadow: #{$sidebar-toggler-focus-shadow};
220221
--#{$prefix}sidebar-toggler-focus-color: #{$sidebar-toggler-focus-color};
@@ -226,7 +227,7 @@
226227
width: var(--#{$prefix}sidebar-toggler-width);
227228
height: var(--#{$prefix}sidebar-toggler-height);
228229
padding: $sidebar-toggler-padding-y $sidebar-toggler-padding-x;
229-
background-color: transparent;
230+
background-color: var(--#{$prefix}sidebar-toggler-bg);
230231
border: 0;
231232
@include border-radius();
232233

@@ -238,7 +239,7 @@
238239
height: 100%;
239240
content: "";
240241
background-color: var(--#{$prefix}sidebar-toggler-color);
241-
mask: var(--#{$prefix}sidebar-toggler-bg) no-repeat center;
242+
mask: var(--#{$prefix}sidebar-toggler-icon) no-repeat center;
242243
@include transition(var(--#{$prefix}sidebar-toggler-transition));
243244
@include rtl() {
244245
transform: rotate(-180deg);

0 commit comments

Comments
 (0)