Skip to content

Commit 0e3734b

Browse files
authored
Merge pull request #1014 from amosfolz/update-AdminLTE-2.3.11
Update to AdminLTE 2.3.11
2 parents df8495e + e27fd84 commit 0e3734b

2 files changed

Lines changed: 684 additions & 661 deletions

File tree

app/sprinkles/core/assets/userfrosting/css/AdminLTE.css

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
22
/*!
3-
* AdminLTE v2.3.6
3+
* AdminLTE v2.3.8
44
* Author: Almsaeed Studio
55
* Website: Almsaeed Studio <http://almsaeedstudio.com>
66
* License: Open source - MIT
@@ -12,25 +12,24 @@
1212
*/
1313
html,
1414
body {
15-
min-height: 100%;
15+
height: 100%;
1616
}
1717
.layout-boxed html,
1818
.layout-boxed body {
1919
height: 100%;
2020
}
2121
body {
22-
-webkit-font-smoothing: antialiased;
23-
-moz-osx-font-smoothing: grayscale;
2422
font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
2523
font-weight: 400;
2624
overflow-x: hidden;
2725
overflow-y: auto;
2826
}
2927
/* Layout */
3028
.wrapper {
31-
min-height: 100%;
29+
height: 100%;
3230
position: relative;
33-
overflow: hidden;
31+
overflow-x: hidden;
32+
overflow-y: auto;
3433
}
3534
.wrapper:before,
3635
.wrapper:after {
@@ -543,6 +542,12 @@ a:focus {
543542
padding: 0;
544543
margin-right: 10px;
545544
}
545+
.sidebar-menu li > a > .fa-angle-left {
546+
position: absolute;
547+
top: 50%;
548+
right: 10px;
549+
margin-top: -8px;
550+
}
546551
.sidebar-menu li.active > a > .fa-angle-left,
547552
.sidebar-menu li.active > a > .pull-right-container > .fa-angle-left {
548553
-webkit-transform: rotate(-90deg);
@@ -631,10 +636,12 @@ a:focus {
631636
background-color: inherit;
632637
}
633638
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
639+
position: relative!important;
634640
float: right;
635641
width: auto!important;
636-
left: 200px!important;
637-
top: 10px!important;
642+
left: 180px !important;
643+
top: -22px !important;
644+
z-index: 900;
638645
}
639646
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
640647
display: none;
@@ -1770,6 +1777,9 @@ a:focus {
17701777
right: 0;
17711778
left: auto;
17721779
}
1780+
.box-header > .box-tools .dropdown-menu > li > a {
1781+
color: #444!important;
1782+
}
17731783
.btn-box-tool {
17741784
padding: 5px;
17751785
font-size: 12px;

0 commit comments

Comments
 (0)