Skip to content

Commit d9e6830

Browse files
committed
1 parent 059c74f commit d9e6830

File tree

10 files changed

+102
-224
lines changed

10 files changed

+102
-224
lines changed

build/less/AdminLTE.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* AdminLTE v2.4.7
2+
* AdminLTE v2.4.8
33
* Author: Almsaeed Studio
44
* Website: Almsaeed Studio <https://adminlte.io>
55
* License: Open source - MIT

build/less/sidebar-mini.less

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -86,42 +86,44 @@
8686
}
8787
}
8888

89-
// Show menu items on hover
90-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
91-
.sidebar-menu > li:hover {
92-
> a {
93-
//overflow: visible;
94-
}
95-
> a > span:not(.pull-right), //:not(.pull-right-container),
96-
> .treeview-menu {
97-
display: block !important;
98-
position: absolute;
99-
width: @sidebar-width - 50;
100-
left: 50px;
101-
}
89+
@media (min-width: @screen-sm) {
90+
// Show menu items on hover
91+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
92+
.sidebar-menu > li:hover {
93+
> a {
94+
//overflow: visible;
95+
}
96+
> a > span:not(.pull-right), //:not(.pull-right-container),
97+
> .treeview-menu {
98+
display: block !important;
99+
position: absolute;
100+
width: @sidebar-width - 50;
101+
left: 50px;
102+
}
102103

103-
//position the header & treeview menus
104-
> a > span {
105-
top: 0;
106-
margin-left: -3px;
107-
padding: 12px 5px 12px 20px;
108-
background-color: inherit;
109-
}
110-
> a > .pull-right-container {
111-
//display: block!important;
112-
position: relative !important;
113-
float: right;
114-
width: auto !important;
115-
left: 200px - 20px !important;
116-
top: -22px !important;
117-
z-index: 900;
118-
> .label:not(:first-of-type) {
119-
display: none;
104+
//position the header & treeview menus
105+
> a > span {
106+
top: 0;
107+
margin-left: -3px;
108+
padding: 12px 5px 12px 20px;
109+
background-color: inherit;
110+
}
111+
> a > .pull-right-container {
112+
//display: block!important;
113+
position: relative !important;
114+
float: right;
115+
width: auto !important;
116+
left: 200px - 20px !important;
117+
top: -22px !important;
118+
z-index: 900;
119+
> .label:not(:first-of-type) {
120+
display: none;
121+
}
122+
}
123+
> .treeview-menu {
124+
top: 44px;
125+
margin-left: 0;
120126
}
121-
}
122-
> .treeview-menu {
123-
top: 44px;
124-
margin-left: 0;
125127
}
126128
}
127129
}

build/scss/_variables.scss

Lines changed: 0 additions & 128 deletions
This file was deleted.

dist/css/AdminLTE.css

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* AdminLTE v2.4.7
2+
* AdminLTE v2.4.8
33
* Author: Almsaeed Studio
44
* Website: Almsaeed Studio <https://adminlte.io>
55
* License: Open source - MIT
@@ -612,33 +612,35 @@ a:focus {
612612
margin-left: 50px;
613613
}
614614
}
615-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
616-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
617-
display: block !important;
618-
position: absolute;
619-
width: 180px;
620-
left: 50px;
621-
}
622-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
623-
top: 0;
624-
margin-left: -3px;
625-
padding: 12px 5px 12px 20px;
626-
background-color: inherit;
627-
}
628-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
629-
position: relative !important;
630-
float: right;
631-
width: auto !important;
632-
left: 180px !important;
633-
top: -22px !important;
634-
z-index: 900;
635-
}
636-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
637-
display: none;
638-
}
639-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
640-
top: 44px;
641-
margin-left: 0;
615+
@media (min-width: 768px) {
616+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
617+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
618+
display: block !important;
619+
position: absolute;
620+
width: 180px;
621+
left: 50px;
622+
}
623+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
624+
top: 0;
625+
margin-left: -3px;
626+
padding: 12px 5px 12px 20px;
627+
background-color: inherit;
628+
}
629+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
630+
position: relative !important;
631+
float: right;
632+
width: auto !important;
633+
left: 180px !important;
634+
top: -22px !important;
635+
z-index: 900;
636+
}
637+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
638+
display: none;
639+
}
640+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
641+
top: 44px;
642+
margin-left: 0;
643+
}
642644
}
643645
.sidebar-expanded-on-hover .main-footer,
644646
.sidebar-expanded-on-hover .content-wrapper {

dist/css/AdminLTE.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alt/AdminLTE-without-plugins.css

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -612,33 +612,35 @@ a:focus {
612612
margin-left: 50px;
613613
}
614614
}
615-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
616-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
617-
display: block !important;
618-
position: absolute;
619-
width: 180px;
620-
left: 50px;
621-
}
622-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
623-
top: 0;
624-
margin-left: -3px;
625-
padding: 12px 5px 12px 20px;
626-
background-color: inherit;
627-
}
628-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
629-
position: relative !important;
630-
float: right;
631-
width: auto !important;
632-
left: 180px !important;
633-
top: -22px !important;
634-
z-index: 900;
635-
}
636-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
637-
display: none;
638-
}
639-
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
640-
top: 44px;
641-
margin-left: 0;
615+
@media (min-width: 768px) {
616+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
617+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
618+
display: block !important;
619+
position: absolute;
620+
width: 180px;
621+
left: 50px;
622+
}
623+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
624+
top: 0;
625+
margin-left: -3px;
626+
padding: 12px 5px 12px 20px;
627+
background-color: inherit;
628+
}
629+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
630+
position: relative !important;
631+
float: right;
632+
width: auto !important;
633+
left: 180px !important;
634+
top: -22px !important;
635+
z-index: 900;
636+
}
637+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
638+
display: none;
639+
}
640+
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
641+
top: 44px;
642+
margin-left: 0;
643+
}
642644
}
643645
.sidebar-expanded-on-hover .main-footer,
644646
.sidebar-expanded-on-hover .content-wrapper {

dist/css/alt/AdminLTE-without-plugins.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/adminlte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @Author Almsaeed Studio
88
* @Support <https://www.almsaeedstudio.com>
99
10-
* @version 2.4.7
10+
* @version 2.4.8
1111
* @repository git://github.com/almasaeed2010/AdminLTE.git
1212
* @license MIT <http://opensource.org/licenses/MIT>
1313
*/

dist/js/adminlte.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "admin-lte",
3-
"version": "2.4.7",
3+
"version": "2.4.8",
44
"main": "dist/js/adminlte.min.js",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)