github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

fix sidebar-mini(-md/-xs) collapse bugs

pull/3162/head
REJack 2020-11-27 12:39:53 +01:00
parent 0a96b70edb
commit 2c98813cc1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/scss/_layout.scss
View File

@ -449,10 +449,7 @@ body:not(.sidebar-mini-md):not(.sidebar-mini-xs) {
} }
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
&, margin-left: 0;
&::before {
margin-left: 0;
}
} }
} }
} }
@ -470,12 +467,11 @@ body:not(.sidebar-mini-md):not(.sidebar-mini-xs) {
margin-left: $sidebar-mini-width; margin-left: $sidebar-mini-width;
} }
} }
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
&, margin-left: $sidebar-mini-width;
&::before { }
margin-left: $sidebar-mini-width; @include media-breakpoint-down(sm) {
} margin-left: 0;
} }
} }
} }
@ -484,11 +480,16 @@ body:not(.sidebar-mini-md):not(.sidebar-mini-xs) {
.content-wrapper, .content-wrapper,
.main-footer, .main-footer,
.main-header { .main-header {
@include transition(margin-left $transition-speed $transition-fn); @include media-breakpoint-up(md) {
@include transition(margin-left $transition-speed $transition-fn);
margin-left: $sidebar-width; margin-left: $sidebar-width;
.sidebar-collapse & { .sidebar-collapse & {
margin-left: $sidebar-mini-width;
}
}
@include media-breakpoint-down(md) {
margin-left: $sidebar-mini-width; margin-left: $sidebar-mini-width;
} }
} }