lisone/AdminLTE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update adminlte version

Browse Source
This commit is contained in:
Abdullah Almsaeed
2016-10-22 15:32:28 -04:00
parent 64443ee54f
commit 97dfbaa79f
403 changed files with 883 additions and 89503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/js/dist/ControlSidebar.js vendored
View File

@@ -61,7 +61,6 @@ var ControlSidebar = function ($) {
_createClass(ControlSidebar, [{
key: 'show',
value: function show() {
console.log('showing', this._config.slide);
// Show the control sidebar
if (this._config.slide) {
$('body').removeClass(ClassName.CONTROL_SIDEBAR_SLIDE);

2
build/js/dist/ControlSidebar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
build/js/dist/Layout.js vendored
View File

@@ -88,6 +88,8 @@ var Layout = function ($) {
$(window).resize(function () {
_this.fixLayoutHeight();
});
$('body, html').css('height', 'auto');
}
}, {
key: '_max',

2
build/js/dist/Layout.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
build/js/src/AdminLTE.js
View File

@@ -79,6 +79,8 @@ const Layout = (($) => {
$(window).resize(() => {
this.fixLayoutHeight()
})
$('body, html').css('height', 'auto');
}
_max(numbers) {
@@ -483,7 +485,6 @@ const ControlSidebar = (($) => {
// Public
show() {
console.log('showing', this._config.slide)
// Show the control sidebar
if (this._config.slide) {
$('body').removeClass(ClassName.CONTROL_SIDEBAR_SLIDE)

2
build/js/src/Layout.js
View File

@@ -80,6 +80,8 @@ const Layout = (($) => {
$(window).resize(() => {
this.fixLayoutHeight()
})
$('body, html').css('height', 'auto');
}
_max(numbers) {

2
build/scss/_bootstrap_variables.scss
View File

@@ -726,7 +726,7 @@ $alert-danger-border: $state-danger-border !default;
$progress-bg: #eee !default;
$progress-bar-color: #0074d9 !default;
$progress-border-radius: $border-radius !default;
$progress-box-shadow: inset 0 .1rem .1rem rgba(0,0,0,.1) !default;
$progress-box-shadow: none !default;
$progress-bar-bg: $brand-primary !default;
$progress-bar-success-bg: $brand-success !default;

4
build/scss/_boxes.scss
View File

@@ -249,6 +249,10 @@
// Tables within the box body
> .table {
margin-bottom: 0;
> thead > tr > th,
> thead > tr > td {
border-top-width: 0;
}
}
// Calendar within the box body

32
build/scss/_control-sidebar.scss
View File

@@ -4,18 +4,19 @@
.control-sidebar {
position: absolute;
top: $main-header-height;
z-index: 830;
&,
&:before {
width: $control-sidebar-width;
top: $main-header-height;
right: -$control-sidebar-width;
bottom: 0;
@include transition(right $transition-speed $transition-fn);
}
&:before {
top: 0;
display: block;
position: fixed;
content: " ";
@@ -25,16 +26,27 @@
// Control sidebar open state
.control-sidebar-open {
.control-sidebar {
&,
&:before {
right: 0;
@include media-breakpoint-up(md) {
.control-sidebar {
&,
&:before {
right: 0;
}
}
.content-wrapper,
.main-footer {
margin-right: $control-sidebar-width;
}
}
.content-wrapper,
.main-footer {
margin-right: $control-sidebar-width;
@include media-breakpoint-down(md) {
.control-sidebar {
&,
&:before {
right: 0;
}
}
}
}
@@ -66,7 +78,7 @@
color: $sidebar-dark-hover-color;
}
// Headers
// Headers and labels
h1,
h2,
h3,
@@ -80,7 +92,7 @@
// Tabs
.nav-tabs {
border-bottom: 0;
background-color: $sidebar-dark-submenu-bg;
background-color: $sidebar-dark-hover-bg;
margin-bottom: 5px;
.nav-item {

6
build/scss/_forms.scss
View File

@@ -3,9 +3,9 @@
* ---------------
*/
.form-control {
@include border-radius($input-radius);
//@include border-radius($input-radius);
box-shadow: none;
border-color: $gray;
//border-color: $gray;
&:focus {
border-color: $brand-primary;
box-shadow: none;
@@ -77,7 +77,7 @@
/* Input group */
.input-group {
.input-group-addon {
@include border-radius($input-radius);
//@include border-radius($input-radius);
border-color: $gray;
background-color: #fff;
}

40
build/scss/_info-box.scss
View File

@@ -4,39 +4,40 @@
*/
.info-box {
display: block;
min-height: 90px;
min-height: 80px;
background: #fff;
width: 100%;
box-shadow: $box-boxshadow;
@include border-radius(2px);
margin-bottom: 15px;
small {
font-size: 14px;
font-size: $font-size-sm;
}
.progress {
background: rgba(0, 0, 0, 0.125);
margin: 5px -10px 5px -10px;
.progress[value] {
background-color: rgba(0, 0, 0, 0.125);
margin: 5px 0;
height: 2px;
&,
& .progress-bar {
@include border-radius(0);
}
.progress-bar {
background: #fff;
}
@include progress-variant(#fff);
@include border-radius(0);
}
.progress[value]::-webkit-progress-bar {
background-color: rgba(0, 0, 0, 0.125);
}
}
.info-box-icon {
@include border-radius-sides(2px, 0, 2px, 0);
@include border-left-radius(2px);
display: block;
float: left;
height: 90px;
width: 90px;
height: 80px;
width: 80px;
text-align: center;
font-size: 45px;
line-height: 90px;
font-size: 40px;
line-height: 80px;
background: rgba(0, 0, 0, 0.2);
> img {
max-width: 100%;
}
@@ -44,19 +45,18 @@
.info-box-content {
padding: 5px 10px;
margin-left: 90px;
margin-left: 80px;
}
.info-box-number {
display: block;
font-weight: bold;
font-size: 18px;
}
.progress-description,
.info-box-text {
display: block;
font-size: 14px;
font-size: $font-size-sm;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

16
build/scss/_layout.scss
View File

@@ -42,16 +42,18 @@ body,
.content-wrapper,
.main-footer {
margin-left: $sidebar-width;
z-index: 3000;
$local-content-transition: margin-right $transition-speed $transition-fn, margin-left $transition-speed $transition-fn;
@include transition($local-content-transition);
@include media-breakpoint-up(md) {
margin-left: $sidebar-width;
z-index: 3000;
$local-content-transition: margin-right $transition-speed $transition-fn, margin-left $transition-speed $transition-fn;
@include transition($local-content-transition);
.sidebar-collapse & {
margin-left: 0;
.sidebar-collapse & {
margin-left: 0;
}
}
@media(max-width: breakpoint-max(md)) {
@include media-breakpoint-down(md) {
&,
&:before {
margin-left: 0;

58
build/scss/_progress-bars.scss
View File

@@ -4,40 +4,25 @@
*/
//General CSS
.progress,
.progress > .progress-bar {
.progress {
@include box-shadow(none);
&, .progress-bar {
@include border-radius($progress-bar-border-radius);
}
@include border-radius($progress-bar-border-radius);
}
/* size variation */
.progress.sm,
// size variation
.progress-sm {
height: 10px;
&, .progress-bar {
@include border-radius($progress-bar-sm-border-radius);
}
}
.progress.xs,
.progress-xs {
height: 7px;
&, .progress-bar {
@include border-radius($progress-bar-xs-border-radius);
}
}
.progress.xxs,
.progress-xxs {
height: 3px;
&, .progress-bar {
@include border-radius($progress-bar-xs-border-radius);
}
}
/* Vertical bars */
// Vertical bars
.progress.vertical {
position: relative;
width: 30px;
@@ -69,44 +54,17 @@
//Progress Groups
.progress-group {
.progress-text {
font-weight: 600;
//display: inline-block;
//margin-bottom: 5px;
}
.progress-number {
float: right;
//float: right;
}
}
/* Remove margins from progress bars when put in a table */
// Remove margins from progress bars when put in a table
.table {
tr > td .progress {
margin: 0;
}
}
/*
// Variations
// -------------------------
.progress-bar-light-blue,
.progress-bar-primary {
@include progress-bar-variant($brand-primary);
}
.progress-bar-green,
.progress-bar-success {
@include progress-bar-variant($brand-success);
}
.progress-bar-aqua,
.progress-bar-info {
@include progress-bar-variant($brand-info);
}
.progress-bar-yellow,
.progress-bar-warning {
@include progress-bar-variant($brand-warning);
}
.progress-bar-red,
.progress-bar-danger {
@include progress-bar-variant($brand-danger);
}
*/

16
build/scss/_select2.scss
View File

@@ -12,8 +12,8 @@
outline: none;
}
.select2-selection--single {
border: 1px solid $gray;
border-radius: $input-radius;
border: 1px solid $gray-x-light;
//border-radius: $input-radius;
padding: 6px 12px;
height: 34px;
}
@@ -24,8 +24,8 @@
}
.select2-dropdown {
border: 1px solid $gray;
border-radius: $input-radius;
border: 1px solid $gray-x-light;
//border-radius: $input-radius;
}
.select2-container--default .select2-results__option--highlighted[aria-selected] {
@@ -63,7 +63,7 @@
.select2-dropdown,
.select2-search--inline {
.select2-search__field {
border: 1px solid $gray;
border: 1px solid $gray-x-light;
&:focus {
outline: none;
border: 1px solid $brand-primary;
@@ -86,14 +86,14 @@
//Multiple select
.select2-container--default {
.select2-selection--multiple {
border: 1px solid $gray;
border-radius: $input-radius;
border: 1px solid $gray-x-light;
//border-radius: $input-radius;
&:focus {
border-color: $brand-primary;
}
}
&.select2-container--focus .select2-selection--multiple {
border-color: $gray;
border-color: $gray-x-light;
}
}

22
build/scss/_sidebar.scss
View File

@@ -28,14 +28,8 @@
}
.status {
position: relative;
padding: 3px 7px;
border: 0;
> .fa,
> .ion,
> .glyphicon {
margin-right: 3px;
}
}
h6 {
@@ -48,11 +42,6 @@
.dropdown-menu {
font-size: $font-size-sm;
}
.dropdown-menu {
position: absolute;
z-index: 99999999;
}
}
// Sidebar navigation menu
@@ -63,6 +52,7 @@
> .nav-link {
@include border-radius(0);
> .nav-icon {
width: 26px;
}
@@ -86,6 +76,7 @@
> .nav-treeview {
display: block;
}
> .nav-link {
.fa-angle-left {
@include rotate(-90deg);
@@ -100,9 +91,11 @@
padding: 0;
margin: 0;
padding-left: 5px;
.nav-treeview {
padding-left: 20px;
}
> .nav-item {
margin: 0;
> .nav-link {
@@ -118,8 +111,15 @@
.nav-header {
font-size: .9em;
padding: $nav-link-padding;
&:not(:first-of-type) {
padding: 1.7em 1em .5em 1em;
}
}
}
.sidebar-form {
.form-control {
border-radius: 0;
}
}

4
build/scss/_table.scss
View File

@@ -54,8 +54,8 @@
}
}
/* .text-center in tables */
table.text-center {
/* .text-xs-center in tables */
table.text-xs-center {
&, td, th {
text-align: center;
}

2
build/scss/_users-list.scss
View File

@@ -29,7 +29,7 @@
}
.users-list-name {
font-weight: 600;
font-size: $font-size-sm;
color: #444;
overflow: hidden;
white-space: nowrap;

17
build/scss/_variables.scss
View File

@@ -1,4 +1,4 @@
// AdminLTE 2 Variables.less
// AdminLTE 3 Variables.less
// =========================
// PATHS
@@ -18,6 +18,7 @@ $fuchsia: #F012BE !default;
$purple: #605ca8 !default;
$maroon: #D81B60 !default;
$black: #111 !default;
$gray-x-light: #d2d6de!default;
// LAYOUT
// --------------------------------------------------------
@@ -90,7 +91,7 @@ $box-boxshadow: 0 1px 1px rgba(0, 0, 0, 0.125) !default;
$box-padding: 10px !default;
// Box variants
$box-default-border-top-color: $gray-light !default;// #d2d6de !default;
$box-default-border-top-color: $gray-x-light !default;// #d2d6de !default;
// BUTTONS
// --------------------------------------------------------
@@ -102,22 +103,14 @@ $progress-bar-border-radius: 1px !default;
$progress-bar-sm-border-radius: 1px !default;
$progress-bar-xs-border-radius: 1px !default;
// FORMS
// --------------------------------------------------------
$input-radius: 0 !default;
// BUTTONS
// --------------------------------------------------------
// Border radius for non flat buttons
$btn-border-radius: 3px !default;
// DIRECT CHAT
// --------------------------------------------------------
$direct-chat-height: 250px !default;
$direct-chat-default-msg-bg: $gray !default;
$direct-chat-default-msg-bg: $gray-x-light !default;
$direct-chat-default-font-color: #444 !default;
$direct-chat-default-msg-border-color: $gray !default;
$direct-chat-default-msg-border-color: $gray-x-light !default;
// CHAT WIDGET
// --------------------------------------------------------