fixed unable to expand sidebar in with navbar-fixed & footer-fixed width

This commit is contained in:
REJack 2019-06-15 13:21:50 +02:00
parent d852f4ba34
commit db9c190e5c
No known key found for this signature in database
GPG key ID: 9F3976CC630CC888
6 changed files with 19 additions and 7 deletions

View file

@ -38,6 +38,7 @@ body,
.main-header {
position: fixed;
z-index: $zindex-main-sidebar - 1;
top: 0;
right: 0;
left: 0;
@ -47,8 +48,10 @@ body,
.layout-footer-fixed & {
.main-footer {
position: fixed;
z-index: $zindex-main-sidebar - 1;
bottom: 0;
width: calc(100% - 250px);
right: 0;
left: 0;
}
}

View file

@ -38,6 +38,7 @@
.sidebar .user-panel > .info,
.nav-sidebar .nav-link p,
.brand-text {
visibility: hidden;
opacity: 0;
margin-left: -10px;
}
@ -69,6 +70,7 @@
.user-panel > .info,
.nav-sidebar .nav-link p,
.brand-text {
visibility: visible;
opacity: 1;
margin-left: 0;
display: inline-block;
@ -138,5 +140,5 @@
.sidebar .nav-link p,
.main-sidebar .brand-text,
.sidebar .user-panel .info {
@include transition(margin-left $transition-speed linear, opacity .5s ease)
@include transition(margin-left $transition-speed linear, opacity $transition-speed ease, visibility $transition-speed ease)
}

11
dist/css/adminlte.css vendored
View file

@ -9731,6 +9731,7 @@ body,
.layout-navbar-fixed .wrapper .main-header {
position: fixed;
z-index: 949;
top: 0;
right: 0;
left: 0;
@ -9738,8 +9739,10 @@ body,
.layout-footer-fixed .wrapper .main-footer {
position: fixed;
z-index: 949;
bottom: 0;
width: calc(100% - 250px);
right: 0;
left: 0;
}
.layout-top-nav .wrapper {
@ -11506,6 +11509,7 @@ body,
.sidebar-mini.sidebar-collapse .sidebar .user-panel > .info,
.sidebar-mini.sidebar-collapse .nav-sidebar .nav-link p,
.sidebar-mini.sidebar-collapse .brand-text {
visibility: hidden;
opacity: 0;
margin-left: -10px;
}
@ -11528,6 +11532,7 @@ body,
.sidebar-mini.sidebar-collapse .main-sidebar:hover .user-panel > .info,
.sidebar-mini.sidebar-collapse .main-sidebar:hover .nav-sidebar .nav-link p,
.sidebar-mini.sidebar-collapse .main-sidebar:hover .brand-text {
visibility: visible;
opacity: 1;
margin-left: 0;
display: inline-block;
@ -11572,6 +11577,7 @@ body,
.sidebar-mini-md.sidebar-collapse .sidebar .user-panel > .info,
.sidebar-mini-md.sidebar-collapse .nav-sidebar .nav-link p,
.sidebar-mini-md.sidebar-collapse .brand-text {
visibility: hidden;
opacity: 0;
margin-left: -10px;
}
@ -11594,6 +11600,7 @@ body,
.sidebar-mini-md.sidebar-collapse .main-sidebar:hover .user-panel > .info,
.sidebar-mini-md.sidebar-collapse .main-sidebar:hover .nav-sidebar .nav-link p,
.sidebar-mini-md.sidebar-collapse .main-sidebar:hover .brand-text {
visibility: visible;
opacity: 1;
margin-left: 0;
display: inline-block;
@ -11642,7 +11649,7 @@ body,
.sidebar .nav-link p,
.main-sidebar .brand-text,
.sidebar .user-panel .info {
transition: margin-left 0.3s linear, opacity 0.5s ease;
transition: margin-left 0.3s linear, opacity 0.3s ease, visibility 0.3s ease;
}
@media (prefers-reduced-motion: reduce) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long