Skip to content

Commit 1762908

Browse files
committed
refactor: don't emit occupy if .sidebar-overlaid
1 parent 57caf53 commit 1762908

File tree

2 files changed

+45
-10
lines changed

2 files changed

+45
-10
lines changed

scss/sidebar/_sidebar-narrow.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
.sidebar-narrow {
5353
@extend %sidebar-narrow;
54-
~ * {
54+
&:not(.sidebar-overlaid) ~ * {
5555
--#{$variable-prefix}sidebar-occupy: #{$sidebar-narrow-width};
5656
}
5757
}
@@ -60,7 +60,7 @@
6060
position: fixed;
6161
z-index: $zindex-fixed + 1;
6262

63-
~ * {
63+
&:not(.sidebar-overlaid) ~ * {
6464
--#{$variable-prefix}sidebar-occupy: #{$sidebar-narrow-width};
6565
}
6666

scss/themes/dark/_variables.scss

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,27 +100,61 @@ $body-bg-dt: $bg-elevation-0 !default;
100100
$body-color-dt: $high-emphasis-dt !default;
101101
$elevation-base-color-dt: 0, 0, 0 !default;
102102

103-
$theme-body-dt: (
103+
// Components
104+
//
105+
// Define common padding and border radius sizes and more.
106+
107+
$border-color-dt: rgba(255, 255, 255, .075) !default;
108+
109+
$theme-root-dt: (
104110
"body-bg": $body-bg-dt,
105111
"body-color": $body-color-dt,
106112
"elevation-base-color": $elevation-base-color-dt,
107113
"text-high-emphasis": $high-emphasis-dt,
108114
"text-medium-emphasis": $medium-emphasis-dt,
109115
"text-disabled": $disabled-dt,
116+
"border-color": $border-color-dt
110117
) !default;
111118

112-
// Components
113-
//
114-
// Define common padding and border radius sizes and more.
115-
116-
$border-color-dt: rgba(255, 255, 255, .075) !default;
117-
118119
// $component-color-dt: $body-color-dt !default;
119120
// $component-bg-dt: $gray-800-dt !default;
120121

121122
$component-active-color-dt: $white !default;
122123
$component-active-bg-dt: $primary-dt !default;
123124

125+
// Accordion
126+
127+
$accordion-button-color-dt: $body-color-dt !default;
128+
$accordion-button-bg-dt: transparent !default;
129+
$accordion-border-color-dt: rgba($white, .125) !default;
130+
131+
$accordion-button-color-dt: $body-color-dt !default;
132+
$accordion-button-bg-dt: transparent !default;
133+
$accordion-border-color-dt: rgba($white, .125) !default;
134+
135+
$accordion-button-active-bg-dt: tint-color(rgba($component-active-bg-dt, .5), 5%) !default;
136+
$accordion-button-active-color-dt: shade-color($component-active-color-dt, 10%) !default;
137+
138+
$accordion-button-focus-border-color-dt: rgba($white, .2) !default;
139+
140+
$accordion-icon-color-dt: $body-color-dt !default;
141+
$accordion-icon-active-color-dt: $body-color-dt !default;
142+
143+
$accordion-button-icon-dt: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-color-dt}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
144+
$accordion-button-active-icon-dt: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$accordion-icon-active-color-dt}'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/></svg>") !default;
145+
146+
147+
$accordion-theme-map: (
148+
"accordion-button-color": $accordion-button-color-dt,
149+
"accordion-button-bg": $accordion-button-bg-dt,
150+
"accordion-border-color": $accordion-border-color-dt,
151+
"accordion-button-active-bg": $accordion-button-active-bg-dt,
152+
"accordion-button-active-color": $accordion-button-active-color-dt,
153+
"accordion-button-focus-border-color": $accordion-button-focus-border-color-dt,
154+
"accordion-button-icon": $accordion-button-icon-dt,
155+
"accordion-button-active-icon": $accordion-button-active-icon-dt
156+
) !default;
157+
124158
// Alert
125159

126160
$alert-theme-variants-dt: (
@@ -569,11 +603,12 @@ $toast-theme-map: (
569603
// --cui-tooltip-color
570604

571605
$theme-map: (
572-
"root": map-merge($theme-body-dt, $link-theme-map),
606+
"root": map-merge($theme-root-dt, $link-theme-map),
573607
"utilities": (
574608
"bg": $theme-colors-dt,
575609
"text": $theme-colors-dt
576610
),
611+
"accordion": $accordion-theme-map,
577612
"alert": $alert-theme-variants-dt,
578613
"breadcrumb": $breadcrumb-theme-map,
579614
"btn": $button-theme-variants-dt,

0 commit comments

Comments
 (0)