mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2025-12-07 09:36:05 -08:00
Update AdminLTE
- from 2.4.5 to 2.4.18 (cannot detect any issues) - set default scancycle for Apple Devices to 1
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.0 Without Third-Party Plugins
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <https://adminlte.io>
|
||||
* License: Open source - MIT
|
||||
* Please visit http://opensource.org/licenses/MIT for more information
|
||||
!*/
|
||||
* AdminLTE v2.4.18
|
||||
* Without Third-Party Plugins
|
||||
*
|
||||
* Author: Colorlib
|
||||
* Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
* Repository: git://github.com/ColorlibHQ/AdminLTE.git
|
||||
* License: MIT <http://opensource.org/licenses/MIT>
|
||||
*/
|
||||
|
||||
//Bootstrap Variables & Mixins
|
||||
//The core bootstrap code have not been modified. These files
|
||||
//are included only for reference.
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.5
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <https://adminlte.io>
|
||||
* License: Open source - MIT
|
||||
* Please visit http://opensource.org/licenses/MIT for more information
|
||||
* AdminLTE v2.4.18
|
||||
*
|
||||
* Author: Colorlib
|
||||
* Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
|
||||
* Repository: git://github.com/ColorlibHQ/AdminLTE.git
|
||||
* License: MIT <http://opensource.org/licenses/MIT>
|
||||
*/
|
||||
|
||||
// Bootstrap
|
||||
//--------------------------------------------------------
|
||||
@import (reference) "../bootstrap-less/mixins";
|
||||
|
||||
@@ -203,9 +203,9 @@
|
||||
margin-right: 5px;
|
||||
}
|
||||
> .box-tools {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 5px;
|
||||
float: right;
|
||||
margin-top: -5px;
|
||||
margin-bottom: -5px;
|
||||
[data-toggle="tooltip"] {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,14 @@
|
||||
}
|
||||
|
||||
// Open without slide over content
|
||||
.control-sidebar-hold-transition {
|
||||
.control-sidebar-bg,
|
||||
.control-sidebar,
|
||||
.content-wrapper {
|
||||
transition: none;
|
||||
}
|
||||
|
||||
}
|
||||
.control-sidebar-open {
|
||||
.control-sidebar-bg,
|
||||
.control-sidebar {
|
||||
|
||||
@@ -70,11 +70,17 @@ body {
|
||||
}
|
||||
|
||||
.content-wrapper {
|
||||
min-height: 100%;
|
||||
min-height: ~"calc(100vh - 101px)";
|
||||
background-color: @content-bg;
|
||||
z-index: 800;
|
||||
}
|
||||
|
||||
@media (max-width: @screen-header-collapse) {
|
||||
.content-wrapper {
|
||||
min-height: ~"calc(100vh - 151px)";
|
||||
}
|
||||
}
|
||||
|
||||
.main-footer {
|
||||
background: #fff;
|
||||
padding: 15px;
|
||||
|
||||
@@ -81,6 +81,14 @@
|
||||
&:active {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
&.fa5 {
|
||||
font-family: "Font Awesome\ 5 Free";
|
||||
&:before {
|
||||
content: "\f0c9";
|
||||
font-weight: 900;
|
||||
}
|
||||
}
|
||||
}
|
||||
.sidebar-toggle .icon-bar {
|
||||
display: none;
|
||||
@@ -119,14 +127,47 @@
|
||||
padding: 0 15px;
|
||||
font-weight: 300;
|
||||
overflow: hidden;
|
||||
|
||||
img {
|
||||
padding: 4px;
|
||||
object-fit: contain;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
//Add support to sidebar mini by allowing the user to create
|
||||
//2 logo designs. mini and lg
|
||||
.logo-lg {
|
||||
//should be visibile when sidebar isn't collapsed
|
||||
display: block;
|
||||
|
||||
img {
|
||||
max-width: 200px;
|
||||
max-height: 50px;
|
||||
}
|
||||
.brandlogo-image {
|
||||
margin-top: 8px;
|
||||
margin-right: 10px;
|
||||
margin-left: -5px;
|
||||
}
|
||||
}
|
||||
.logo-mini {
|
||||
display: none;
|
||||
|
||||
img {
|
||||
max-width: 50px;
|
||||
max-height: 50px;
|
||||
}
|
||||
.brandlogo-image {
|
||||
margin-top: 8px;
|
||||
margin-right: 10px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.brandlogo-image {
|
||||
float: left;
|
||||
height: 34px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
//Navbar Brand. Alternative logo with layout-top-nav
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
.login-page,
|
||||
.register-page {
|
||||
height: auto;
|
||||
background: @gray-lte;
|
||||
}
|
||||
|
||||
|
||||
@@ -604,3 +604,34 @@
|
||||
width: 100% !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Horizontal rules
|
||||
hr {
|
||||
border-top: 1px solid @hr-border;
|
||||
}
|
||||
|
||||
// bootstrap slider
|
||||
|
||||
#red .slider-selection {
|
||||
background: #f56954;
|
||||
}
|
||||
|
||||
#blue .slider-selection {
|
||||
background: #3c8dbc;
|
||||
}
|
||||
|
||||
#green .slider-selection {
|
||||
background: #00a65a;
|
||||
}
|
||||
|
||||
#yellow .slider-selection {
|
||||
background: #f39c12;
|
||||
}
|
||||
|
||||
#aqua .slider-selection {
|
||||
background: #00c0ef;
|
||||
}
|
||||
|
||||
#purple .slider-selection {
|
||||
background: #932ab6;
|
||||
}
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
.sidebar-menu > li > a > span,
|
||||
.sidebar-menu > li > .treeview-menu,
|
||||
.sidebar-menu > li > a > .pull-right,
|
||||
.sidebar-menu > li > a > span > .pull-right,
|
||||
.sidebar-menu li.header {
|
||||
display: none !important;
|
||||
-webkit-transform: translateZ(0);
|
||||
@@ -86,42 +87,44 @@
|
||||
}
|
||||
}
|
||||
|
||||
// Show menu items on hover
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
|
||||
.sidebar-menu > li:hover {
|
||||
> a {
|
||||
//overflow: visible;
|
||||
}
|
||||
> a > span:not(.pull-right), //:not(.pull-right-container),
|
||||
> .treeview-menu {
|
||||
display: block !important;
|
||||
position: absolute;
|
||||
width: @sidebar-width - 50;
|
||||
left: 50px;
|
||||
}
|
||||
|
||||
//position the header & treeview menus
|
||||
> a > span {
|
||||
top: 0;
|
||||
margin-left: -3px;
|
||||
padding: 12px 5px 12px 20px;
|
||||
background-color: inherit;
|
||||
}
|
||||
> a > .pull-right-container {
|
||||
//display: block!important;
|
||||
position: relative !important;
|
||||
float: right;
|
||||
width: auto !important;
|
||||
left: 200px - 20px !important;
|
||||
top: -22px !important;
|
||||
z-index: 900;
|
||||
> .label:not(:first-of-type) {
|
||||
display: none;
|
||||
@media (min-width: @screen-sm) {
|
||||
// Show menu items on hover
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
|
||||
.sidebar-menu > li:hover {
|
||||
> a {
|
||||
//overflow: visible;
|
||||
}
|
||||
> a > span:not(.pull-right), //:not(.pull-right-container),
|
||||
> .treeview-menu {
|
||||
display: block !important;
|
||||
position: absolute;
|
||||
width: @sidebar-width - 50;
|
||||
left: 50px;
|
||||
}
|
||||
|
||||
//position the header & treeview menus
|
||||
> a > span {
|
||||
top: 0;
|
||||
margin-left: -3px;
|
||||
padding: 12px 5px 12px 20px;
|
||||
background-color: inherit;
|
||||
}
|
||||
> a > .pull-right-container {
|
||||
//display: block!important;
|
||||
position: relative !important;
|
||||
float: right;
|
||||
width: auto !important;
|
||||
left: 200px - 20px !important;
|
||||
top: -22px !important;
|
||||
z-index: 900;
|
||||
> .label:not(:first-of-type) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
> .treeview-menu {
|
||||
top: 44px;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
> .treeview-menu {
|
||||
top: 44px;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
.skin-black-light {
|
||||
//Navbar & Logo
|
||||
.main-header {
|
||||
//.box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
|
||||
border-bottom: 1px solid @gray-lte;
|
||||
.box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
|
||||
// border-bottom: 1px solid @gray-lte;
|
||||
.navbar-toggle {
|
||||
color: #333;
|
||||
}
|
||||
@@ -41,7 +41,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
> .logo {
|
||||
.logo {
|
||||
.logo-variant(#fff; #333);
|
||||
border-right: 1px solid @gray-lte;
|
||||
@media (max-width: @screen-header-collapse) {
|
||||
@@ -62,4 +62,4 @@
|
||||
}
|
||||
//Create the sidebar skin
|
||||
.skin-light-sidebar(#fff);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
> .logo {
|
||||
.logo {
|
||||
.logo-variant(#fff; #333);
|
||||
border-right: 1px solid #eee;
|
||||
@media (max-width: @screen-header-collapse) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Tree view menu
|
||||
// Tree view menu
|
||||
.treeview-menu {
|
||||
display: none;
|
||||
list-style: none;
|
||||
@@ -27,4 +27,19 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.treeview {
|
||||
> ul.treeview-menu {
|
||||
overflow: hidden;
|
||||
height:auto;
|
||||
padding-top:0px !important;
|
||||
padding-bottom: 0px !important;
|
||||
}
|
||||
}
|
||||
.treeview.menu-open {
|
||||
> ul.treeview-menu {
|
||||
overflow: visible;
|
||||
height:auto;
|
||||
}
|
||||
}
|
||||
@@ -102,6 +102,11 @@
|
||||
// Border radius for non flat buttons
|
||||
@btn-border-radius: 3px;
|
||||
|
||||
// HR
|
||||
// --------------------------------------------------------
|
||||
// Horizontal line color.
|
||||
@hr-border: @gray;
|
||||
|
||||
// DIRECT CHAT
|
||||
// --------------------------------------------------------
|
||||
@direct-chat-height: 250px;
|
||||
|
||||
Reference in New Issue
Block a user