Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c47d442

Browse files
committedOct 25, 2024·
Fix: sidebar-occupy-start/end overwrote sidebar-occupy-start/end: 0 when hidden (.hide or mobile), because of !important, resulting in main content being blank padded when sidebar was hidden.
1 parent a490cb1 commit c47d442

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed
 

‎scss/sidebar/_sidebar-narrow.scss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,20 @@
5959
}
6060
}
6161

62+
.sidebar-narrow,
63+
.sidebar-narrow-unfoldable {
64+
@include media-breakpoint-up($mobile-breakpoint) {
65+
&:not(.sidebar-end):not(.hide) ~ * {
66+
--#{$prefix}sidebar-occupy-start: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
67+
}
68+
&.sidebar-end:not(.hide) ~ * {
69+
--#{$prefix}sidebar-occupy-end: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
70+
}
71+
}
72+
}
73+
6274
.sidebar-narrow {
6375
@extend %sidebar-narrow;
64-
&:not(.sidebar-end) ~ * {
65-
--#{$prefix}sidebar-occupy-start: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
66-
}
67-
&.sidebar-end ~ * {
68-
--#{$prefix}sidebar-occupy-end: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
69-
}
7076

7177
.nav-link {
7278
overflow: hidden;
@@ -76,13 +82,6 @@
7682
.sidebar-narrow-unfoldable {
7783
position: fixed;
7884

79-
&:not(.sidebar-end) ~ * {
80-
--#{$prefix}sidebar-occupy-start: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
81-
}
82-
&.sidebar-end ~ * {
83-
--#{$prefix}sidebar-occupy-end: #{$sidebar-narrow-width} !important; // stylelint-disable-line declaration-no-important
84-
}
85-
8685
&:not(:hover) {
8786
@extend %sidebar-narrow;
8887
}

‎scss/sidebar/_sidebar.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@
6969
&:not(.sidebar-end){
7070
@include ltr-rtl("margin-left", calc(-1 * var(--#{$prefix}sidebar-width)));
7171
~ * {
72-
--#{$prefix}sidebar-occupy-start: 0;
72+
--#{$prefix}sidebar-occupy-start: 0 !important; // stylelint-disable-line declaration-no-important
7373
}
7474
}
7575
&.sidebar-end {
7676
@include ltr-rtl("margin-right", calc(-1 * var(--#{$prefix}sidebar-width)));
7777
~ * {
78-
--#{$prefix}sidebar-occupy-end: 0;
78+
--#{$prefix}sidebar-occupy-end: 0 !important; // stylelint-disable-line declaration-no-important
7979
}
8080
}
8181
}
@@ -119,15 +119,15 @@
119119
@include ltr-rtl("left", 0);
120120
@include ltr-rtl("margin-left", calc(-1 * var(--#{$prefix}sidebar-width)));
121121
~ * {
122-
--#{$prefix}sidebar-occupy-start: 0 !important; // stylelint-disable-line
122+
--#{$prefix}sidebar-occupy-start: 0 !important; // stylelint-disable-line declaration-no-important
123123
}
124124
}
125125

126126
&.sidebar-end {
127127
@include ltr-rtl("right", 0);
128128
@include ltr-rtl("margin-right", calc(-1 * var(--#{$prefix}sidebar-width)));
129129
~ * {
130-
--#{$prefix}sidebar-occupy-end: 0 !important; // stylelint-disable-line
130+
--#{$prefix}sidebar-occupy-end: 0 !important; // stylelint-disable-line declaration-no-important
131131
}
132132
}
133133

@@ -157,7 +157,7 @@
157157
&:not(.sidebar-end) {
158158
@include ltr-rtl("left", 0);
159159
~ * {
160-
--#{$prefix}sidebar-occupy-start: 0 !important; // stylelint-disable-line
160+
--#{$prefix}sidebar-occupy-start: 0 !important; // stylelint-disable-line declaration-no-important
161161
}
162162

163163
&:not(.show) {
@@ -167,7 +167,7 @@
167167
&.sidebar-end {
168168
@include ltr-rtl("right", 0);
169169
~ * {
170-
--#{$prefix}sidebar-occupy-end: 0 !important; // stylelint-disable-line
170+
--#{$prefix}sidebar-occupy-end: 0 !important; // stylelint-disable-line declaration-no-important
171171
}
172172

173173
&:not(.show) {

0 commit comments

Comments
 (0)
Please sign in to comment.