github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix #1864

pull/1932/head v2.4.8
Abdullah Almsaeed 2018-07-15 14:48:11 -04:00
parent 059c74fe83
commit d9e6830184
10 changed files with 103 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/less/AdminLTE.less
View File

@ -1,5 +1,5 @@
/*! /*!
* AdminLTE v2.4.7 * AdminLTE v2.4.8
* Author: Almsaeed Studio * Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io> * Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT * License: Open source - MIT

72
build/less/sidebar-mini.less
View File

@ -86,42 +86,44 @@
} }
} }
// Show menu items on hover @media (min-width: @screen-sm) {
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse { // Show menu items on hover
.sidebar-menu > li:hover { .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
> a { .sidebar-menu > li:hover {
//overflow: visible; > a {
} //overflow: visible;
> a > span:not(.pull-right), //:not(.pull-right-container), }
> .treeview-menu { > a > span:not(.pull-right), //:not(.pull-right-container),
display: block !important; > .treeview-menu {
position: absolute; display: block !important;
width: @sidebar-width - 50; position: absolute;
left: 50px; width: @sidebar-width - 50;
} left: 50px;
}
//position the header & treeview menus
> a > span { //position the header & treeview menus
top: 0; > a > span {
margin-left: -3px; top: 0;
padding: 12px 5px 12px 20px; margin-left: -3px;
background-color: inherit; padding: 12px 5px 12px 20px;
} background-color: inherit;
> a > .pull-right-container { }
//display: block!important; > a > .pull-right-container {
position: relative !important; //display: block!important;
float: right; position: relative !important;
width: auto !important; float: right;
left: 200px - 20px !important; width: auto !important;
top: -22px !important; left: 200px - 20px !important;
z-index: 900; top: -22px !important;
> .label:not(:first-of-type) { z-index: 900;
display: none; > .label:not(:first-of-type) {
display: none;
}
}
> .treeview-menu {
top: 44px;
margin-left: 0;
} }
}
> .treeview-menu {
top: 44px;
margin-left: 0;
} }
} }
} }

128
build/scss/_variables.scss
View File

@ -1,128 +0,0 @@
// AdminLTE 3 Variables.less
// =========================
// PATHS
// --------------------------------------------------------
$path-to-bootstrap-sass: "../../bower_components/bootstrap/scss" !default;
// COLORS
// --------------------------------------------------------
/*
$blue: #0073b7 !default;
$black: #111 !default;
$orange: #FF851B !default;
*/
$fuchsia: #F012BE !default;
$purple: #605ca8 !default;
$maroon: #D81B60 !default;
$teal: #39CCCC !default;
$olive: #3D9970 !default;
$lime: #01FF70 !default;
$navy: #001F3F !default;
$gray-x-light: #d2d6de !default;
// TEXT
// --------------------------------------------------------
$font-size-root: 16px !default;
// LAYOUT
// --------------------------------------------------------
// Side bar and logo width
$sidebar-width: 230px !default;
// Boxed layout maximum width
$boxed-layout-max-width: 1250px !default;
// When to show the smaller logo
$screen-header-collapse: map-get($grid-breakpoints, md) !default;
// Link colors (aka: <a> tags)
$link-color: $brand-primary !default;
$link-hover-color: lighten($link-color, 15%) !default;
// Body background (Affects main content background only)
$main-bg: $gray-lighter !default;
// MAIN HEADER
// --------------------------------------------------------
$main-header-link-padding-y: 15px !default;
$main-header-link-padding-x: 15px !default;
$main-header-brand-padding-y: 12px !default;
$main-header-brand-padding-x: $main-header-brand-padding-y !default;
$main-header-height: (($font-size-root * $line-height-base) + ($main-header-link-padding-y * 2)) !default;
// MAIN FOOTER
// --------------------------------------------------------
$main-footer-padding: 15px !default;
$main-footer-border-top-width: 2px !default;
$main-footer-border-top: $main-footer-border-top-width solid darken($main-bg, 10%) !default;
$main-footer-height: (($font-size-root * $line-height-base) + ($main-footer-padding * 2)) + $main-footer-border-top-width !default;
// SIDEBAR SKINS
// --------------------------------------------------------
// Dark sidebar
$sidebar-dark-bg: #2c333c !default;//#222d32 !default;
$sidebar-dark-hover-bg: darken($sidebar-dark-bg, 4%) !default;
$sidebar-dark-color: #C2C7D0!default;//lighten($sidebar-dark-bg, 60%) !default;
$sidebar-dark-hover-color: #fff !default;
$sidebar-dark-submenu-bg: lighten($sidebar-dark-bg, 5%) !default;
$sidebar-dark-submenu-color: #C2C7D0!default;//lighten($sidebar-dark-submenu-bg, 40%) !default;
$sidebar-dark-submenu-hover-color: #fff !default;
// Light sidebar
$sidebar-light-bg: #f9fafc !default;
$sidebar-light-hover-bg: lighten(#f0f0f1, 1.5%) !default;
$sidebar-light-color: #444 !default;
$sidebar-light-hover-color: #000 !default;
$sidebar-light-submenu-bg: $sidebar-light-hover-bg !default;
$sidebar-light-submenu-color: #777 !default;
$sidebar-light-submenu-hover-color: #000 !default;
// SIDEBAR MINI
// --------------------------------------------------------
$sidebar-mini-width: 55px !default;
// CONTROL SIDEBAR
// --------------------------------------------------------
$control-sidebar-width: $sidebar-width !default;
// BOXES
// --------------------------------------------------------
$box-border-color: #f4f4f4 !default;
$box-border-radius: 3px !default;
$box-footer-bg: #fff !default;
$box-boxshadow: 0 1px 1px rgba(0, 0, 0, 0.125) !default;
$box-padding: 10px !default;
// Box variants
$box-default-border-top-color: $gray-x-light !default;// #d2d6de !default;
// BUTTONS
// --------------------------------------------------------
$btn-boxshadow: none !default;
// PROGRESS BARS
// --------------------------------------------------------
$progress-bar-border-radius: 1px !default;
$progress-bar-sm-border-radius: 1px !default;
$progress-bar-xs-border-radius: 1px !default;
// DIRECT CHAT
// --------------------------------------------------------
$direct-chat-height: 250px !default;
$direct-chat-default-msg-bg: $gray-x-light !default;
$direct-chat-default-font-color: #444 !default;
$direct-chat-default-msg-border-color: $gray-x-light !default;
// CHAT WIDGET
// --------------------------------------------------------
$attachment-border-radius: 3px !default;
// TRANSITIONS SETTINGS
// --------------------------------------------------------
// Transition global options
$transition-speed: 0.3s !default;
$transition-fn: ease-in-out !default;

58
dist/css/AdminLTE.css vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* AdminLTE v2.4.7 * AdminLTE v2.4.8
* Author: Almsaeed Studio * Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io> * Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT * License: Open source - MIT
@ -612,33 +612,35 @@ a:focus {
margin-left: 50px; margin-left: 50px;
} }
} }
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right), @media (min-width: 768px) {
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu { .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
display: block !important; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
position: absolute; display: block !important;
width: 180px; position: absolute;
left: 50px; width: 180px;
} left: 50px;
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span { }
top: 0; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
margin-left: -3px; top: 0;
padding: 12px 5px 12px 20px; margin-left: -3px;
background-color: inherit; 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; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
float: right; position: relative !important;
width: auto !important; float: right;
left: 180px !important; width: auto !important;
top: -22px !important; left: 180px !important;
z-index: 900; 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 > 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; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
margin-left: 0; top: 44px;
margin-left: 0;
}
} }
.sidebar-expanded-on-hover .main-footer, .sidebar-expanded-on-hover .main-footer,
.sidebar-expanded-on-hover .content-wrapper { .sidebar-expanded-on-hover .content-wrapper {

4
dist/css/AdminLTE.min.css vendored
View File

File diff suppressed because one or more lines are too long

56
dist/css/alt/AdminLTE-without-plugins.css vendored
View File

@ -612,33 +612,35 @@ a:focus {
margin-left: 50px; margin-left: 50px;
} }
} }
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right), @media (min-width: 768px) {
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu { .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
display: block !important; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
position: absolute; display: block !important;
width: 180px; position: absolute;
left: 50px; width: 180px;
} left: 50px;
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span { }
top: 0; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span {
margin-left: -3px; top: 0;
padding: 12px 5px 12px 20px; margin-left: -3px;
background-color: inherit; 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; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
float: right; position: relative !important;
width: auto !important; float: right;
left: 180px !important; width: auto !important;
top: -22px !important; left: 180px !important;
z-index: 900; 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 > 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; .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
margin-left: 0; top: 44px;
margin-left: 0;
}
} }
.sidebar-expanded-on-hover .main-footer, .sidebar-expanded-on-hover .main-footer,
.sidebar-expanded-on-hover .content-wrapper { .sidebar-expanded-on-hover .content-wrapper {

2
dist/css/alt/AdminLTE-without-plugins.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/adminlte.js vendored
View File

@ -7,7 +7,7 @@
* @Author Almsaeed Studio * @Author Almsaeed Studio
* @Support <https://www.almsaeedstudio.com> * @Support <https://www.almsaeedstudio.com>
* @Email <abdullah@almsaeedstudio.com> * @Email <abdullah@almsaeedstudio.com>
* @version 2.4.7 * @version 2.4.8
* @repository git://github.com/almasaeed2010/AdminLTE.git * @repository git://github.com/almasaeed2010/AdminLTE.git
* @license MIT <http://opensource.org/licenses/MIT> * @license MIT <http://opensource.org/licenses/MIT>
*/ */

2
dist/js/adminlte.min.js vendored
View File

@ -7,7 +7,7 @@
* @Author Almsaeed Studio * @Author Almsaeed Studio
* @Support <https://www.almsaeedstudio.com> * @Support <https://www.almsaeedstudio.com>
* @Email <abdullah@almsaeedstudio.com> * @Email <abdullah@almsaeedstudio.com>
* @version 2.4.7 * @version 2.4.8
* @repository git://github.com/almasaeed2010/AdminLTE.git * @repository git://github.com/almasaeed2010/AdminLTE.git
* @license MIT <http://opensource.org/licenses/MIT> * @license MIT <http://opensource.org/licenses/MIT>
*/ */

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "admin-lte", "name": "admin-lte",
"version": "2.4.7", "version": "2.4.8",
"main": "dist/js/adminlte.min.js", "main": "dist/js/adminlte.min.js",
"repository": { "repository": {
"type": "git", "type": "git",