Compare commits

...

9 Commits

Author SHA1 Message Date
Abdullah Almsaeed
89d24bd778 bump version 2018-07-14 17:47:25 -04:00
Abdullah Almsaeed
c618c2814f Merge #1847 2018-07-14 17:40:00 -04:00
OKAZAKI EITARO
1339932caa Fixed an issue where height becomes NaN when there is no main-header (#1847) 2018-07-14 17:39:38 -04:00
Filip Chalupa
2de87c8ab8 Update npmignore: don't ignore bower_components (#1784)
- without them the npm package is crippled

- it's hard to import admin-lte less files since many of them reference missing bower_components
2018-07-14 17:38:59 -04:00
Abdullah Almsaeed
eb9098c2c8 Merge #1756 2018-07-14 17:37:49 -04:00
Abdullah Almsaeed
60eb217689 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2018-07-14 17:32:49 -04:00
Abdullah Almsaeed
5a4e022541 Merge 2018-07-14 17:32:34 -04:00
Kyle Spearrin
58ef2125b6 fix control sidebar top padding (#1525) 2018-07-14 17:30:00 -04:00
Alexander Wunschik
9431039bf5 replaced boxed-bg images with static color 2017-06-06 10:51:25 +02:00
18 changed files with 154 additions and 30 deletions

View File

@@ -1,3 +1,2 @@
bower_components/
documentation/
composer.json
composer.json

View File

@@ -84,8 +84,9 @@
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
// Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight;
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var headerHeight = $(Selector.mainHeader).outerHeight() || 0;
var neg = headerHeight + footerHeight;
var windowHeight = $(window).height();
var sidebarHeight = $(Selector.sidebar).height() || 0;

View File

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

View File

@@ -24,7 +24,7 @@
padding-top: @navbar-height;
z-index: 1010;
// Fix position after header collapse
@media (max-width: @screen-sm) {
@media (max-width: @screen-xs-max) {
padding-top: @navbar-height + 50;
}
// Tab panes

View File

@@ -34,7 +34,7 @@ body {
}
.layout-boxed {
background: url('@{boxed-layout-bg-image-path}') repeat fixed;
background-color: @sidebar-light-bg;
}
/*

View File

@@ -1,11 +1,6 @@
// AdminLTE 2 Variables.less
// =========================
// PATHS
// --------------------------------------------------------
@boxed-layout-bg-image-path: "../img/boxed-bg.jpg";
// COLORS
// --------------------------------------------------------
// Primary

128
build/scss/_variables.scss Normal file
View File

@@ -0,0 +1,128 @@
// 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;

View File

@@ -1,5 +1,5 @@
/*!
* AdminLTE v2.4.4
* AdminLTE v2.4.5
* Author: Almsaeed Studio
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
@@ -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
@@ -692,7 +692,7 @@ a:focus {
padding-top: 50px;
z-index: 1010;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.control-sidebar {
padding-top: 100px;
}

File diff suppressed because one or more lines are too long

View File

@@ -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
@@ -692,7 +692,7 @@ a:focus {
padding-top: 50px;
z-index: 1010;
}
@media (max-width: 768px) {
@media (max-width: 767px) {
.control-sidebar {
padding-top: 100px;
}

File diff suppressed because one or more lines are too long

BIN
dist/img/boxed-bg.jpg vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

BIN
dist/img/boxed-bg.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

7
dist/js/adminlte.js vendored
View File

@@ -7,7 +7,7 @@
* @Author Almsaeed Studio
* @Support <https://www.almsaeedstudio.com>
* @Email <abdullah@almsaeedstudio.com>
* @version 2.4.4
* @version 2.4.5
* @repository git://github.com/almasaeed2010/AdminLTE.git
* @license MIT <http://opensource.org/licenses/MIT>
*/
@@ -601,8 +601,9 @@ throw new Error('AdminLTE requires jQuery')
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
// Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight;
var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var headerHeight = $(Selector.mainHeader).outerHeight() || 0;
var neg = headerHeight + footerHeight;
var windowHeight = $(window).height();
var sidebarHeight = $(Selector.sidebar).height() || 0;

File diff suppressed because one or more lines are too long

View File

@@ -39,7 +39,7 @@
<li><a href="http://jqueryui.com/" target="_blank">jQuery UI</a></li>
<li><a href="http://anthonyterrien.com/knob/" target="_blank">jQuery Knob</a></li>
<li><a href="http://jvectormap.com/" target="_blank">jVector Map</a></li>
<li><a href="http://rocha.la/jQuery-slimScroll/" target="_blank">Slim Scroll</a></li>
<li><a href="http://rocha.la/jQuery-slimScroll/" target="_blank">jQuery Slim Scroll</a></li>
<li><a href="http://github.hubspot.com/pace/docs/welcome/" target="_blank">Pace</a></li>
</ul>
</div><!-- /.col -->

View File

@@ -8,9 +8,9 @@
<!-- Bootstrap 3.3.7 -->
<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
<!-- Font Awesome -->
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
<!-- Ionicons -->
<link rel="stylesheet" href="bower_components/Ionicons/css/ionicons.min.css">
<link rel="stylesheet" href="../bower_components/Ionicons/c/css/ionicons.min.css">
<!-- Theme style -->
<link rel="stylesheet" href="../dist/css/AdminLTE.min.css">
<link rel="stylesheet" href="../dist/css/skins/_all-skins.min.css">
@@ -2029,7 +2029,7 @@
<li><a href="http://jqueryui.com/" target="_blank">jQuery UI</a></li>
<li><a href="http://anthonyterrien.com/knob/" target="_blank">jQuery Knob</a></li>
<li><a href="http://jvectormap.com/" target="_blank">jVector Map</a></li>
<li><a href="http://rocha.la/jQuery-slimScroll/" target="_blank">Slim Scroll</a></li>
<li><a href="http://rocha.la/jQuery-slimScroll/" target="_blank">jQuery Slim Scroll</a></li>
<li><a href="http://github.hubspot.com/pace/docs/welcome/" target="_blank">Pace</a></li>
</ul>
</div><!-- /.col -->

View File

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