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

fix invisible nav items if there is a second nav in content

pull/3867/head
REJack 2021-07-29 19:33:58 +02:00
parent 2c4d879d64
commit 52ff423787
4 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/scss/_cards.scss
View File

@ -62,7 +62,7 @@
}
}
.nav.flex-column {
.nav.flex-column:not(.nav-sidebar) {
> li {
border-bottom: 1px solid $card-border-color;
margin: 0;

60
build/scss/_main-sidebar.scss
View File

@ -14,7 +14,6 @@
outline: none;
}
}
}
.sidebar {
@ -201,7 +200,7 @@
}
}
.sidebar-is-opening .nav-sidebar {
.sidebar-is-opening .sidebar .nav-sidebar {
.nav-link p {
animation-name: fadeIn;
animation-duration: $transition-speed;
@ -575,7 +574,7 @@
}
}
.sidebar-collapse &.nav-child-indent {
.sidebar-collapse &.nav-child-indent .sidebar {
.nav-treeview {
.nav-icon {
margin-left: .55rem;
@ -731,17 +730,15 @@
.nav-icon {
@include transition(margin-left $transition-fn $transition-speed);
margin-left: .6rem;
}
}
}
.sidebar-mini.sidebar-collapse .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini.sidebar-collapse .main-sidebar:hover &.nav-child-indent,
.sidebar-mini-md.sidebar-collapse .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini-md.sidebar-collapse .main-sidebar:hover &.nav-child-indent,
.sidebar-mini-xs.sidebar-collapse .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini-xs.sidebar-collapse .main-sidebar:hover &.nav-child-indent {
.sidebar-mini.sidebar-collapse,
.sidebar-mini-md.sidebar-collapse,
.sidebar-mini-xs.sidebar-collapse {
.main-sidebar.sidebar-focused &.nav-child-indent,
.main-sidebar:hover &.nav-child-indent {
.nav-treeview {
padding-left: 1rem;
@ -751,13 +748,13 @@
}
}
}
}
.sidebar-mini.sidebar-collapse.text-sm .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini.sidebar-collapse.text-sm .main-sidebar:hover &.nav-child-indent,
.sidebar-mini-md.sidebar-collapse.text-sm .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini-md.sidebar-collapse.text-sm .main-sidebar:hover &.nav-child-indent,
.sidebar-mini-xs.sidebar-collapse.text-sm .main-sidebar.sidebar-focused &.nav-child-indent,
.sidebar-mini-xs.sidebar-collapse.text-sm .main-sidebar:hover &.nav-child-indent {
.sidebar-mini.sidebar-collapse.text-sm,
.sidebar-mini-md.sidebar-collapse.text-sm,
.sidebar-mini-xs.sidebar-collapse.text-sm {
.main-sidebar.sidebar-focused &.nav-child-indent,
.main-sidebar:hover &.nav-child-indent {
.nav-treeview {
padding-left: .5rem;
@ -767,22 +764,22 @@
}
}
}
}
.sidebar-mini.sidebar-collapse &,
.sidebar-mini-md.sidebar-collapse &,
.sidebar-mini-xs.sidebar-collapse & {
.sidebar {
> .nav-item > .nav-link {
.nav-icon {
margin-left: .55rem;
}
&.active {
> .nav-icon{
> .nav-icon {
margin-left: .36rem;
}
}
}
&.nav-child-indent {
.nav-treeview {
.nav-treeview {
@ -792,23 +789,25 @@
}
}
}
}
.sidebar-mini.sidebar-collapse.text-sm &,
.sidebar-mini-md.sidebar-collapse.text-sm &,
.sidebar-mini-xs.sidebar-collapse.text-sm & {
.sidebar {
> .nav-item > .nav-link {
.nav-icon {
margin-left: .75rem;
}
&.active {
> .nav-icon{
> .nav-icon {
margin-left: calc(.75rem - 3px);
}
}
}
}
}
[class*="sidebar-dark"] & {
&.nav-sidebar > .nav-item {
@ -855,7 +854,6 @@
}
}
.nav-collapse-hide-child {
.menu-open > .nav-treeview {
max-height: min-content;
@ -864,7 +862,7 @@
animation-fill-mode: both;
}
.sidebar-collapse & {
.sidebar-collapse .sidebar & {
.menu-open > .nav-treeview {
max-height: 0;
animation-name: fadeOut;
@ -873,12 +871,11 @@
}
}
.sidebar-mini.sidebar-collapse .main-sidebar.sidebar-focused &,
.sidebar-mini.sidebar-collapse .main-sidebar:not(.sidebar-no-expand):hover &,
.sidebar-mini-md.sidebar-collapse .main-sidebar.sidebar-focused &,
.sidebar-mini-md.sidebar-collapse .main-sidebar:not(.sidebar-no-expand):hover &,
.sidebar-mini-xs.sidebar-collapse .main-sidebar.sidebar-focused &,
.sidebar-mini-xs.sidebar-collapse .main-sidebar:not(.sidebar-no-expand):hover & {
.sidebar-mini.sidebar-collapse,
.sidebar-mini-md.sidebar-collapse,
.sidebar-mini-xs.sidebar-collapse {
.main-sidebar.sidebar-focused &,
.main-sidebar:not(.sidebar-no-expand):hover & {
.menu-open > .nav-treeview {
max-height: min-content;
animation-name: fadeIn;
@ -886,6 +883,7 @@
animation-fill-mode: both;
}
}
}
}
// Nav Compact
@ -1136,7 +1134,7 @@
padding: $sidebar-custom-padding-x $sidebar-custom-padding-y;
}
height: fill-available;
height: stretch;
}
.main-sidebar-custom-lg {
@ -1169,7 +1167,7 @@
}
}
@include dark-mode () {
@include dark-mode() {
@each $name, $color in $theme-colors-alt {
.sidebar-dark-#{$name},
.sidebar-light-#{$name} {

2
build/scss/_sidebar-mini.scss
View File

@ -451,6 +451,7 @@
padding-left: 0;
}
.sidebar {
.brand-text,
.user-panel > .info,
.nav-sidebar .nav-link p {
@ -467,6 +468,7 @@
}
}
}
}
}
.nav-sidebar {

6
build/scss/mixins/_sidebar.scss
View File

@ -45,13 +45,13 @@
display: none;
}
.nav-sidebar .nav-link p {
.sidebar .nav-sidebar .nav-link p {
width: 0;
white-space: nowrap;
}
.sidebar .user-panel > .info,
.nav-sidebar .nav-link p,
.sidebar .nav-sidebar .nav-link p,
.brand-text {
margin-left: -10px;
animation-name: fadeOut;
@ -109,7 +109,7 @@
}
.user-panel > .info,
.nav-sidebar .nav-link p,
.sidebar .nav-sidebar .nav-link p,
.brand-text,
.logo-xl {
display: inline-block;