fixed sidebar mini collpased hover nav styles

pull/2477/head
REJack 2019-12-18 12:43:57 +01:00
parent 56c5319f98
commit 05f23cb8c3
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
6 changed files with 114 additions and 30 deletions

View File

@ -465,8 +465,8 @@
}
}
.sidebar-mini .main-sidebar:hover &.nav-compact,
.sidebar-mini-md .main-sidebar:hover &.nav-compact,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover &.nav-compact,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover &.nav-compact,
.sidebar-mini .main-sidebar.sidebar-focused &.nav-compact,
.sidebar-mini-md .main-sidebar.sidebar-focused &.nav-compact {
.nav-icon {
@ -600,6 +600,18 @@
margin-left: 1.05rem;
}
&.active {
> .nav-icon {
margin-left: 1.05rem;
}
}
}
> .nav-item > .nav-link {
.nav-icon {
margin-left: 1.05rem;
}
&.active {
> .nav-icon {
margin-left: .85rem;
@ -634,13 +646,37 @@
}
}
}
.sidebar-mini .main-sidebar:hover &,
.sidebar-mini-md .main-sidebar:hover &,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover &,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover &,
.sidebar-mini .main-sidebar.sidebar-focused &,
.sidebar-mini-md .main-sidebar.sidebar-focused & {
&.nav-compact {
> .nav-item .nav-link {
.nav-icon {
margin-left: 0;
}
&.active {
> .nav-icon {
margin-left: 0;
}
}
}
> .nav-item > .nav-link {
.nav-icon {
margin-left: 0;
}
&.active {
> .nav-icon {
margin-left: -3px;
}
}
}
}
&.nav-compact,
&.nav-flat {
> .nav-item .nav-link {
.nav-icon {

View File

@ -112,6 +112,18 @@
}
}
}
.nav-flat.nav-compact {
.nav-icon {
margin-left: 1.05rem;
}
.nav-treeview {
.nav-icon {
margin-left: .85rem;
}
}
}
}
}

78
dist/css/adminlte.css vendored
View File

@ -12259,8 +12259,8 @@ body.sidebar-collapse:not(.sidebar-mini-md):not(.sidebar-mini) .main-header::bef
margin-left: .45rem;
}
.sidebar-mini .main-sidebar:hover .nav-compact.nav-compact .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-compact.nav-compact .nav-icon,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-compact.nav-compact .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-compact.nav-compact .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-compact.nav-compact .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-compact.nav-compact .nav-icon {
margin-left: 0;
@ -12373,6 +12373,16 @@ body.sidebar-collapse:not(.sidebar-mini-md):not(.sidebar-mini) .main-header::bef
.sidebar-mini.sidebar-collapse .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md.sidebar-collapse .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon {
margin-left: 1.05rem;
}
.sidebar-mini.sidebar-collapse .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md.sidebar-collapse .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon {
margin-left: 1.05rem;
}
.sidebar-mini.sidebar-collapse .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md.sidebar-collapse .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon {
margin-left: .85rem;
}
@ -12396,42 +12406,58 @@ body.sidebar-collapse:not(.sidebar-mini-md):not(.sidebar-mini) .main-header::bef
margin-left: .85rem;
}
.sidebar-mini .main-sidebar:hover .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon, .sidebar-mini .main-sidebar:hover .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon {
margin-left: 0;
}
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon {
margin-left: 0;
}
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon {
margin-left: 0;
}
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon {
margin-left: -3px;
}
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item .nav-link .nav-icon {
margin-left: -3px;
}
.sidebar-mini .main-sidebar:hover .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon, .sidebar-mini .main-sidebar:hover .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item .nav-link.active > .nav-icon {
margin-left: -3px;
}
.sidebar-mini .main-sidebar:hover .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon, .sidebar-mini .main-sidebar:hover .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item > .nav-link .nav-icon {
margin-left: 0;
}
.sidebar-mini .main-sidebar:hover .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon, .sidebar-mini .main-sidebar:hover .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:hover .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar:not(.sidebar-no-expand):hover .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-compact > .nav-item > .nav-link.active > .nav-icon,
.sidebar-mini-md .main-sidebar.sidebar-focused .nav-legacy.nav-flat > .nav-item > .nav-link.active > .nav-icon {
margin-left: -3px;
}
@ -12862,6 +12888,16 @@ body.sidebar-collapse:not(.sidebar-mini-md):not(.sidebar-mini) .main-header::bef
margin-left: .3rem;
}
.sidebar-collapse .sidebar-no-expand.main-sidebar.sidebar-focused .nav-flat.nav-compact .nav-icon,
.sidebar-collapse .sidebar-no-expand.main-sidebar:hover .nav-flat.nav-compact .nav-icon {
margin-left: 1.05rem;
}
.sidebar-collapse .sidebar-no-expand.main-sidebar.sidebar-focused .nav-flat.nav-compact .nav-treeview .nav-icon,
.sidebar-collapse .sidebar-no-expand.main-sidebar:hover .nav-flat.nav-compact .nav-treeview .nav-icon {
margin-left: .85rem;
}
.nav-sidebar {
position: relative;
}

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