Skip to content
This repository has been archived by the owner on Jul 28, 2022. It is now read-only.

Commit

Permalink
upgrade adminlte to v-2.4.8. fixed fixed content-wrapper height issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrpadilla
rrpadilla committed Jul 30, 2018
1 parent 50fc5ba commit d6423f1
Show file tree
Hide file tree
Showing 189 changed files with 378 additions and 370 deletions.
62 changes: 32 additions & 30 deletions public/adminlte/css/AdminLTE.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* AdminLTE v2.4.2
* AdminLTE v2.4.8
* Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
Expand Down Expand Up @@ -46,7 +46,7 @@ body {
position: relative;
}
.layout-boxed {
background: url('../img/boxed-bg.jpg') repeat fixed;
background-color: #f9fafc;
}
/*
* Content Wrapper - contains the main content
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 Expand Up @@ -692,7 +694,7 @@ a:focus {
padding-top: 50px;
z-index: 1010;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.control-sidebar {
padding-top: 100px;
}
Expand Down
4 changes: 2 additions & 2 deletions public/adminlte/css/AdminLTE.min.css
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions public/adminlte/css/skins/_all-skins.css
View file
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
2 changes: 1 addition & 1 deletion public/adminlte/css/skins/_all-skins.min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/adminlte/css/skins/skin-black-light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,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
2 changes: 1 addition & 1 deletion public/adminlte/css/skins/skin-black-light.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions public/adminlte/css/skins/skin-black.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,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
Loading

0 comments on commit d6423f1

Please sign in to comment.