refactor: don't emit occupy if .sidebar-overlaid

mrholek · mrholek · commit 2ed919027d95 · 2021-03-09T00:27:41.000+01:00
diff --git a/scss/sidebar/_sidebar.scss b/scss/sidebar/_sidebar.scss
@@ -14,7 +14,7 @@
   box-shadow: none;
   @include transition($sidebar-transition);
 
-  ~ * {
+  &:not(.sidebar-overlaid) ~ * {
     --#{$variable-prefix}sidebar-occupy: #{$sidebar-width};
   }
 
@@ -66,7 +66,7 @@
       margin-right: - $sidebar-width;
     }
 
-    ~ * {
+    &:not(.sidebar-overlaid) ~ * {
       --#{$variable-prefix}sidebar-occupy: 0;
     }
   }
@@ -76,7 +76,7 @@
       flex: 0 0 $value;
       width: $value;
 
-      ~ * {
+      &:not(.sidebar-overlaid) ~ * {
         --#{$variable-prefix}sidebar-occupy: #{$value};
       }
 
@@ -95,6 +95,7 @@
       top: 0;
       bottom: 0;
       z-index: $zindex-fixed;
+      @include elevation(2);
 
       &:not(.sidebar-right) {
         left: 0;
@@ -119,6 +120,7 @@
     top: 0;
     bottom: 0;
     z-index: $zindex-fixed + 2;
+    @include elevation(3);
 
     &:not(.sidebar-right) {
       left: 0;
@@ -269,7 +271,7 @@
           }
         }
       }
-      ~ * {
+      &:not(.sidebar-overlaid) ~ * {
         --#{$variable-prefix}sidebar-occupy: 0;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`box-shadow: none;`
`15`	`15`	`@include transition($sidebar-transition);`
`16`	`16`
`17`		`- ~ * {`
	`17`	`+ &:not(.sidebar-overlaid) ~ * {`
`18`	`18`	`--#{$variable-prefix}sidebar-occupy: #{$sidebar-width};`
`19`	`19`	`}`
`20`	`20`
`@@ -66,7 +66,7 @@`
`66`	`66`	`margin-right: - $sidebar-width;`
`67`	`67`	`}`
`68`	`68`
`69`		`- ~ * {`
	`69`	`+ &:not(.sidebar-overlaid) ~ * {`
`70`	`70`	`--#{$variable-prefix}sidebar-occupy: 0;`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -76,7 +76,7 @@`
`76`	`76`	`flex: 0 0 $value;`
`77`	`77`	`width: $value;`
`78`	`78`
`79`		`- ~ * {`
	`79`	`+ &:not(.sidebar-overlaid) ~ * {`
`80`	`80`	`--#{$variable-prefix}sidebar-occupy: #{$value};`
`81`	`81`	`}`
`82`	`82`
`@@ -95,6 +95,7 @@`
`95`	`95`	`top: 0;`
`96`	`96`	`bottom: 0;`
`97`	`97`	`z-index: $zindex-fixed;`
	`98`	`+ @include elevation(2);`
`98`	`99`
`99`	`100`	`&:not(.sidebar-right) {`
`100`	`101`	`left: 0;`
`@@ -119,6 +120,7 @@`
`119`	`120`	`top: 0;`
`120`	`121`	`bottom: 0;`
`121`	`122`	`z-index: $zindex-fixed + 2;`
	`123`	`+ @include elevation(3);`
`122`	`124`
`123`	`125`	`&:not(.sidebar-right) {`
`124`	`126`	`left: 0;`
`@@ -269,7 +271,7 @@`
`269`	`271`	`}`
`270`	`272`	`}`
`271`	`273`	`}`
`272`		`- ~ * {`
	`274`	`+ &:not(.sidebar-overlaid) ~ * {`
`273`	`275`	`--#{$variable-prefix}sidebar-occupy: 0;`
`274`	`276`	`}`
`275`	`277`	`}`