Skip to content

Commit

Permalink
Update AdminLTE to v2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroennoten committed Sep 30, 2017
1 parent 34a0915 commit f4026e1
Show file tree
Hide file tree
Showing 67 changed files with 20,377 additions and 1,586 deletions.
587 changes: 0 additions & 587 deletions resources/assets/bootstrap/css/bootstrap-theme.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/assets/bootstrap/css/bootstrap-theme.css.map

This file was deleted.

6 changes: 0 additions & 6 deletions resources/assets/bootstrap/css/bootstrap-theme.min.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/assets/bootstrap/css/bootstrap-theme.min.css.map

This file was deleted.

13 changes: 0 additions & 13 deletions resources/assets/bootstrap/js/npm.js

This file was deleted.

215 changes: 125 additions & 90 deletions resources/assets/dist/css/AdminLTE.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
/*!
* AdminLTE v2.3.8
* AdminLTE v2.4.0
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
* Please visit http://opensource.org/licenses/MIT for more information
!*/
*/
/*
* Core: General Layout Style
* -------------------------
Expand Down Expand Up @@ -51,10 +50,8 @@ body {
}
/*
* Content Wrapper - contains the main content
* ```.right-side has been deprecated as of v2.0.0 in favor of .content-wrapper ```
*/
.content-wrapper,
.right-side,
.main-footer {
-webkit-transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
-moz-transition: -moz-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
Expand All @@ -64,36 +61,31 @@ body {
z-index: 820;
}
.layout-top-nav .content-wrapper,
.layout-top-nav .right-side,
.layout-top-nav .main-footer {
margin-left: 0;
}
@media (max-width: 767px) {
.content-wrapper,
.right-side,
.main-footer {
margin-left: 0;
}
}
@media (min-width: 768px) {
.sidebar-collapse .content-wrapper,
.sidebar-collapse .right-side,
.sidebar-collapse .main-footer {
margin-left: 0;
}
}
@media (max-width: 767px) {
.sidebar-open .content-wrapper,
.sidebar-open .right-side,
.sidebar-open .main-footer {
-webkit-transform: translate(230px, 0);
-ms-transform: translate(230px, 0);
-o-transform: translate(230px, 0);
transform: translate(230px, 0);
}
}
.content-wrapper,
.right-side {
.content-wrapper {
min-height: 100%;
background-color: #ecf0f5;
z-index: 800;
Expand Down Expand Up @@ -128,13 +120,17 @@ body {
.fixed.layout-boxed .wrapper {
max-width: 100%;
}
body.hold-transition .content-wrapper,
body.hold-transition .right-side,
body.hold-transition .main-footer,
body.hold-transition .main-sidebar,
body.hold-transition .left-side,
body.hold-transition .main-header .navbar,
body.hold-transition .main-header .logo {
.fixed .wrapper {
overflow: hidden;
}
.hold-transition .content-wrapper,
.hold-transition .right-side,
.hold-transition .main-footer,
.hold-transition .main-sidebar,
.hold-transition .left-side,
.hold-transition .main-header .navbar,
.hold-transition .main-header .logo,
.hold-transition .menu-open .fa-angle-left {
/* Fix for IE */
-webkit-transition: none;
-o-transition: none;
Expand Down Expand Up @@ -412,8 +408,7 @@ a:focus {
* Component: Sidebar
* ------------------
*/
.main-sidebar,
.left-side {
.main-sidebar {
position: absolute;
top: 0;
left: 0;
Expand All @@ -427,32 +422,28 @@ a:focus {
transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
}
@media (max-width: 767px) {
.main-sidebar,
.left-side {
.main-sidebar {
padding-top: 100px;
}
}
@media (max-width: 767px) {
.main-sidebar,
.left-side {
.main-sidebar {
-webkit-transform: translate(-230px, 0);
-ms-transform: translate(-230px, 0);
-o-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (min-width: 768px) {
.sidebar-collapse .main-sidebar,
.sidebar-collapse .left-side {
.sidebar-collapse .main-sidebar {
-webkit-transform: translate(-230px, 0);
-ms-transform: translate(-230px, 0);
-o-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (max-width: 767px) {
.sidebar-open .main-sidebar,
.sidebar-open .left-side {
.sidebar-open .main-sidebar {
-webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0);
-o-transform: translate(0, 0);
Expand Down Expand Up @@ -541,51 +532,25 @@ a:focus {
height: auto;
padding: 0;
margin-right: 10px;
-webkit-transition: transform 0.5s ease;
-o-transition: transform 0.5s ease;
transition: transform 0.5s ease;
}
.sidebar-menu li > a > .fa-angle-left {
position: absolute;
top: 50%;
right: 10px;
margin-top: -8px;
}
.sidebar-menu li.active > a > .fa-angle-left,
.sidebar-menu li.active > a > .pull-right-container > .fa-angle-left {
.sidebar-menu .menu-open > a > .fa-angle-left,
.sidebar-menu .menu-open > a > .pull-right-container > .fa-angle-left {
-webkit-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
-o-transform: rotate(-90deg);
transform: rotate(-90deg);
}
.sidebar-menu li.active > .treeview-menu {
display: block;
}
.sidebar-menu .treeview-menu {
display: none;
list-style: none;
padding: 0;
margin: 0;
padding-left: 5px;
}
.sidebar-menu .treeview-menu .treeview-menu {
padding-left: 20px;
}
.sidebar-menu .treeview-menu > li {
margin: 0;
}
.sidebar-menu .treeview-menu > li > a {
padding: 5px 5px 5px 15px;
.sidebar-menu .active > .treeview-menu {
display: block;
font-size: 14px;
}
.sidebar-menu .treeview-menu > li > a > .fa,
.sidebar-menu .treeview-menu > li > a > .glyphicon,
.sidebar-menu .treeview-menu > li > a > .ion {
width: 20px;
}
.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-left,
.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-down,
.sidebar-menu .treeview-menu > li > a > .fa-angle-left,
.sidebar-menu .treeview-menu > li > a > .fa-angle-down {
width: auto;
}
/*
* Component: Sidebar Mini
Expand Down Expand Up @@ -622,34 +587,6 @@ a:focus {
padding-bottom: 5px;
border-bottom-right-radius: 4px;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
display: block !important;
position: absolute;
width: 180px;
left: 50px;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > span {
top: 0;
margin-left: -3px;
padding: 12px 5px 12px 20px;
background-color: inherit;
}
.sidebar-mini.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.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
display: none;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
top: 44px;
margin-left: 0;
}
.sidebar-mini.sidebar-collapse .main-sidebar .user-panel > .info,
.sidebar-mini.sidebar-collapse .sidebar-form,
.sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span,
Expand All @@ -675,6 +612,41 @@ 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;
}
.sidebar-expanded-on-hover .main-footer,
.sidebar-expanded-on-hover .content-wrapper {
margin-left: 50px;
}
.sidebar-expanded-on-hover .main-sidebar {
box-shadow: 3px 0 8px rgba(0, 0, 0, 0.125);
}
.sidebar-menu,
.main-sidebar .user-panel,
.sidebar-menu > li.header {
Expand Down Expand Up @@ -743,6 +715,12 @@ a:focus {
margin-right: 230px;
}
}
.fixed .control-sidebar {
position: fixed;
height: 100%;
overflow-y: auto;
padding-bottom: 50px;
}
.nav-tabs.control-sidebar-tabs > li:first-of-type > a,
.nav-tabs.control-sidebar-tabs > li:first-of-type > a:hover,
.nav-tabs.control-sidebar-tabs > li:first-of-type > a:focus {
Expand Down Expand Up @@ -2499,6 +2477,9 @@ a:focus {
margin-bottom: -2px;
margin-right: 5px;
}
.nav-tabs-custom > .nav-tabs > li.disabled > a {
color: #777;
}
.nav-tabs-custom > .nav-tabs > li > a {
color: #444;
border-radius: 0;
Expand Down Expand Up @@ -3084,6 +3065,35 @@ table.text-center th {
height: auto;
float: left;
}
.treeview-menu {
display: none;
list-style: none;
padding: 0;
margin: 0;
padding-left: 5px;
}
.treeview-menu .treeview-menu {
padding-left: 20px;
}
.treeview-menu > li {
margin: 0;
}
.treeview-menu > li > a {
padding: 5px 5px 5px 15px;
display: block;
font-size: 14px;
}
.treeview-menu > li > a > .fa,
.treeview-menu > li > a > .glyphicon,
.treeview-menu > li > a > .ion {
width: 20px;
}
.treeview-menu > li > a > .pull-right-container > .fa-angle-left,
.treeview-menu > li > a > .pull-right-container > .fa-angle-down,
.treeview-menu > li > a > .fa-angle-left,
.treeview-menu > li > a > .fa-angle-down {
width: auto;
}
/*
* Page: Mailbox
* -------------
Expand Down Expand Up @@ -4266,7 +4276,10 @@ table.text-center th {
.select2-dropdown .select2-search__field:focus,
.select2-search--inline .select2-search__field:focus {
outline: none;
border: 1px solid #3c8dbc;
}
.select2-container--default.select2-container--focus .select2-selection--multiple,
.select2-container--default .select2-search--dropdown .select2-search__field {
border-color: #3c8dbc !important;
}
.select2-container--default .select2-results__option[aria-disabled=true] {
color: #999;
Expand Down Expand Up @@ -4304,6 +4317,28 @@ table.text-center th {
.select2-container .select2-selection--single .select2-selection__rendered {
padding-right: 10px;
}
.box .datepicker-inline,
.box .datepicker-inline .datepicker-days,
.box .datepicker-inline > table,
.box .datepicker-inline .datepicker-days > table {
width: 100%;
}
.box .datepicker-inline td:hover,
.box .datepicker-inline .datepicker-days td:hover,
.box .datepicker-inline > table td:hover,
.box .datepicker-inline .datepicker-days > table td:hover {
background-color: rgba(255, 255, 255, 0.3);
}
.box .datepicker-inline td.day.old,
.box .datepicker-inline .datepicker-days td.day.old,
.box .datepicker-inline > table td.day.old,
.box .datepicker-inline .datepicker-days > table td.day.old,
.box .datepicker-inline td.day.new,
.box .datepicker-inline .datepicker-days td.day.new,
.box .datepicker-inline > table td.day.new,
.box .datepicker-inline .datepicker-days > table td.day.new {
color: #777;
}
/*
* General: Miscellaneous
* ----------------------
Expand Down
8 changes: 4 additions & 4 deletions resources/assets/dist/css/AdminLTE.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit f4026e1

Please sign in to comment.