Skip to content

Commit

Permalink
⬆️ 升级 AdminLTE 版本
Browse files Browse the repository at this point in the history
  • Loading branch information
ruibaby committed Jan 8, 2019
1 parent d63f794 commit 850a4f3
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 45 deletions.
58 changes: 30 additions & 28 deletions src/main/resources/static/halo-backend/css/AdminLTE.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* AdminLTE v2.4.5
* AdminLTE v2.4.8
* Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
Expand Down Expand Up @@ -612,33 +612,35 @@ a:focus {
margin-left: 50px;
}
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
display: block !important;
position: absolute;
width: 180px;
left: 50px;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
top: 0;
margin-left: -3px;
padding: 12px 5px 12px 20px;
background-color: inherit;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
position: relative !important;
float: right;
width: auto !important;
left: 180px !important;
top: -22px !important;
z-index: 900;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
display: none;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
top: 44px;
margin-left: 0;
@media (min-width: 768px) {
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
display: block !important;
position: absolute;
width: 180px;
left: 50px;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
top: 0;
margin-left: -3px;
padding: 12px 5px 12px 20px;
background-color: inherit;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
position: relative !important;
float: right;
width: auto !important;
left: 180px !important;
top: -22px !important;
z-index: 900;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
display: none;
}
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
top: 44px;
margin-left: 0;
}
}
.sidebar-expanded-on-hover .main-footer,
.sidebar-expanded-on-hover .content-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/halo-backend/css/AdminLTE.min.css

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/main/resources/static/halo-backend/css/skins/_all-skins.css
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,23 @@
border-left: 1px solid #eee;
border-right-width: 0;
}
.skin-black .main-header > .logo {
.skin-black .main-header .logo {
background-color: #ffffff;
color: #333333;
border-bottom: 0 solid transparent;
border-right: 1px solid #eee;
}
.skin-black .main-header > .logo:hover {
.skin-black .main-header .logo:hover {
background-color: #fcfcfc;
}
@media (max-width: 767px) {
.skin-black .main-header > .logo {
.skin-black .main-header .logo {
background-color: #222222;
color: #ffffff;
border-bottom: 0 solid transparent;
border-right: none;
}
.skin-black .main-header > .logo:hover {
.skin-black .main-header .logo:hover {
background-color: #1f1f1f;
}
}
Expand Down Expand Up @@ -514,23 +514,23 @@
border-left: 1px solid #d2d6de;
border-right-width: 0;
}
.skin-black-light .main-header > .logo {
.skin-black-light .main-header .logo {
background-color: #ffffff;
color: #333333;
border-bottom: 0 solid transparent;
border-right: 1px solid #d2d6de;
}
.skin-black-light .main-header > .logo:hover {
.skin-black-light .main-header .logo:hover {
background-color: #fcfcfc;
}
@media (max-width: 767px) {
.skin-black-light .main-header > .logo {
.skin-black-light .main-header .logo {
background-color: #222222;
color: #ffffff;
border-bottom: 0 solid transparent;
border-right: none;
}
.skin-black-light .main-header > .logo:hover {
.skin-black-light .main-header .logo:hover {
background-color: #1f1f1f;
}
}
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/static/halo-backend/js/adminlte.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @Author Almsaeed Studio
* @Support <https://www.almsaeedstudio.com>
* @Email <[email protected]>
* @version 2.4.5
* @version 2.4.8
* @repository git://github.com/almasaeed2010/AdminLTE.git
* @license MIT <http://opensource.org/licenses/MIT>
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/halo-backend/js/adminlte.min.js

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

0 comments on commit 850a4f3

Please sign in to comment.