瀏覽代碼

Add more css features

Abdullah Almsaeed 8 年之前
父節點
當前提交
547428c8c9

+ 1 - 1
build/scss/AdminLTE.scss

@@ -16,7 +16,7 @@
 
 // Core
 // ----
-@import "core";
+@import "layout";
 
 // COMPONENTS
 // ----------

+ 2 - 2
build/scss/_bootstrap-social.scss

@@ -7,8 +7,8 @@
  * https://github.com/lipis/bootstrap-social
  */
 
-$bs-height-base: ($line-height + $input-padding-y * 2);
-$bs-height-lg: (floor($font-size-lg * $line-height) + $input-padding-y-lg * 2);
+$bs-height-base: ($line-height-base + $input-padding-y * 2);
+$bs-height-lg: (floor($font-size-lg * $line-height-base) + $input-padding-y-lg * 2);
 $bs-height-sm: (floor($font-size-sm * 1.5) + $input-padding-y-sm * 2);
 $bs-height-xs: (floor($font-size-sm * 1.2) + $input-padding-y-sm + 1);
 

+ 843 - 0
build/scss/_bootstrap_variables.scss

@@ -0,0 +1,843 @@
+// Variables
+//
+// Copy settings from this file into the provided `_custom.scss` to override
+// the Bootstrap defaults without modifying key, versioned files.
+
+
+// Table of Contents
+//
+// Colors
+// Options
+// Spacing
+// Body
+// Links
+// Grid breakpoints
+// Grid containers
+// Grid columns
+// Fonts
+// Components
+
+@mixin _assert-ascending($map, $map-name) {
+  $prev-key: null;
+  $prev-num: null;
+  @each $key, $num in $map {
+    @if $prev-num == null {
+      // Do nothing
+    } @else if not comparable($prev-num, $num) {
+      @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+    } @else if $prev-num >= $num {
+      @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+    }
+    $prev-key: $key;
+    $prev-num: $num;
+  }
+}
+
+// General variable structure
+//
+// Variable format should follow the `$component-modifier-state-property` order.
+
+
+// Colors
+//
+// Grayscale and brand colors for use across Bootstrap.
+
+$gray-dark:                 #373a3c !default;
+$gray:                      #55595c !default;
+$gray-light:                #818a91 !default;
+$gray-lighter:              #eceeef !default;
+$gray-lightest:             #f7f7f9 !default;
+
+$brand-primary:             #3c8dbc !default;
+$brand-success:             #00a65a !default;
+$brand-info:                #00c0ef !default;
+$brand-warning:             #f39c12 !default;
+$brand-danger:              #dd4b39 !default;
+$brand-inverse:             $gray-dark !default;
+
+
+// Options
+//
+// Quickly modify global styling by enabling or disabling optional features.
+
+$enable-flex:               false !default;
+$enable-rounded:            true !default;
+$enable-shadows:            true !default;
+$enable-gradients:          false !default;
+$enable-transitions:        true !default;
+$enable-hover-media-query:  false !default;
+$enable-grid-classes:       true !default;
+$enable-print-styles:       true !default;
+
+
+// Spacing
+//
+// Control the default styling of most Bootstrap elements by modifying these
+// variables. Mostly focused on spacing.
+// You can add more entries to the $spacers map, should you need more variation.
+
+$spacer:   1rem !default;
+$spacer-x: $spacer !default;
+$spacer-y: $spacer !default;
+$spacers: (
+        0: (
+                x: 0,
+                y: 0
+        ),
+        1: (
+                x: $spacer-x,
+                y: $spacer-y
+        ),
+        2: (
+                x: ($spacer-x * 1.5),
+                y: ($spacer-y * 1.5)
+        ),
+        3: (
+                x: ($spacer-x * 3),
+                y: ($spacer-y * 3)
+        )
+) !default;
+$border-width: 1px !default;
+
+
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg:    #fff !default;
+$body-color: $gray-dark !default;
+
+
+// Links
+//
+// Style anchor elements.
+
+$link-color:            $brand-primary !default;
+$link-decoration:       none !default;
+$link-hover-color:      darken($link-color, 15%) !default;
+$link-hover-decoration: underline !default;
+
+
+// Grid breakpoints
+//
+// Define the minimum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+$grid-breakpoints: (
+        xs: 0,
+        sm: 576px,
+        md: 768px,
+        lg: 992px,
+        xl: 1200px
+) !default;
+@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
+
+
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+$container-max-widths: (
+        sm: 540px,
+        md: 720px,
+        lg: 960px,
+        xl: 1140px
+) !default;
+@include _assert-ascending($container-max-widths, "$container-max-widths");
+
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+$grid-columns:               12 !default;
+$grid-gutter-width-base:     30px !default;
+$grid-gutter-widths: (
+        xs: $grid-gutter-width-base,
+        sm: $grid-gutter-width-base,
+        md: $grid-gutter-width-base,
+        lg: $grid-gutter-width-base,
+        xl: $grid-gutter-width-base
+) !default;
+
+// Typography
+//
+// Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
+$font-family-serif:      Georgia, "Times New Roman", Times, serif !default;
+$font-family-monospace:  Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
+$font-family-base:       $font-family-sans-serif !default;
+
+// Pixel value used to responsively scale all typography. Applied to the `<html>` element.
+$font-size-root: 16px !default;
+
+$font-size-base: 1rem !default;
+$font-size-lg:   1.25rem !default;
+$font-size-sm:   .875rem !default;
+$font-size-xs:   .75rem !default;
+
+$line-height-base: 1.5 !default;
+
+$font-size-h1: 2.5rem !default;
+$font-size-h2: 2rem !default;
+$font-size-h3: 1.75rem !default;
+$font-size-h4: 1.5rem !default;
+$font-size-h5: 1.25rem !default;
+$font-size-h6: 1rem !default;
+
+$display1-size: 6rem !default;
+$display2-size: 5.5rem !default;
+$display3-size: 4.5rem !default;
+$display4-size: 3.5rem !default;
+
+$display1-weight: 300 !default;
+$display2-weight: 300 !default;
+$display3-weight: 300 !default;
+$display4-weight: 300 !default;
+
+$headings-margin-bottom: ($spacer / 2) !default;
+$headings-font-family:   inherit !default;
+$headings-font-weight:   500 !default;
+$headings-line-height:   1.1 !default;
+$headings-color:         inherit !default;
+
+$lead-font-size:   1.25rem !default;
+$lead-font-weight: 300 !default;
+
+$text-muted: $gray-light !default;
+
+$abbr-border-color: $gray-light !default;
+
+$blockquote-small-color:  $gray-light !default;
+$blockquote-font-size:    ($font-size-base * 1.25) !default;
+$blockquote-border-color: $gray-lighter !default;
+$blockquote-border-width: .25rem !default;
+
+$hr-border-color: rgba(0,0,0,.1) !default;
+$hr-border-width: $border-width !default;
+
+$mark-padding: .2em !default;
+
+$dt-font-weight: bold !default;
+
+$kbd-box-shadow:         inset 0 -.1rem 0 rgba(0,0,0,.25) !default;
+$nested-kbd-font-weight: bold !default;
+
+$list-inline-padding: 5px !default;
+
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+$line-height-lg:         (4 / 3) !default;
+$line-height-sm:         1.5 !default;
+
+$border-radius:          .25rem !default;
+$border-radius-lg:       .3rem !default;
+$border-radius-sm:       .2rem !default;
+
+$component-active-color: #fff !default;
+$component-active-bg:    $brand-primary !default;
+
+$caret-width:            .3em !default;
+$caret-width-lg:         $caret-width !default;
+
+
+// Tables
+//
+// Customizes the `.table` component with basic values, each used across all table variations.
+
+$table-cell-padding:            .75rem !default;
+$table-sm-cell-padding:         .3rem !default;
+
+$table-bg:                      transparent !default;
+$table-bg-accent:               rgba(0,0,0,.05) !default;
+$table-bg-hover:                rgba(0,0,0,.075) !default;
+$table-bg-active:               $table-bg-hover !default;
+
+$table-border-width:            $border-width !default;
+$table-border-color:            $gray-lighter !default;
+
+
+// Buttons
+//
+// For each of Bootstrap's buttons, define text, background and border color.
+
+$btn-padding-x:                  1rem !default;
+$btn-padding-y:                  .5rem !default;
+$btn-line-height:                1.25 !default;
+$btn-font-weight:                normal !default;
+$btn-box-shadow:                 inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default;
+$btn-active-box-shadow:          inset 0 3px 5px rgba(0,0,0,.125) !default;
+
+$btn-primary-color:              #fff !default;
+$btn-primary-bg:                 $brand-primary !default;
+$btn-primary-border:             $btn-primary-bg !default;
+
+$btn-secondary-color:            $gray-dark !default;
+$btn-secondary-bg:               #fff !default;
+$btn-secondary-border:           #ccc !default;
+
+$btn-info-color:                 #fff !default;
+$btn-info-bg:                    $brand-info !default;
+$btn-info-border:                $btn-info-bg !default;
+
+$btn-success-color:              #fff !default;
+$btn-success-bg:                 $brand-success !default;
+$btn-success-border:             $btn-success-bg !default;
+
+$btn-warning-color:              #fff !default;
+$btn-warning-bg:                 $brand-warning !default;
+$btn-warning-border:             $btn-warning-bg !default;
+
+$btn-danger-color:               #fff !default;
+$btn-danger-bg:                  $brand-danger !default;
+$btn-danger-border:              $btn-danger-bg !default;
+
+$btn-link-disabled-color:        $gray-light !default;
+
+$btn-padding-x-sm:               .5rem !default;
+$btn-padding-y-sm:               .25rem !default;
+
+$btn-padding-x-lg:               1.5rem !default;
+$btn-padding-y-lg:               .75rem !default;
+
+$btn-block-spacing-y:            .5rem !default;
+$btn-toolbar-margin:             .5rem !default;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius:              $border-radius !default;
+$btn-border-radius-lg:           $border-radius-lg !default;
+$btn-border-radius-sm:           $border-radius-sm !default;
+
+
+// Forms
+
+$input-padding-x:                .75rem !default;
+$input-padding-y:                .5rem !default;
+$input-line-height:              1.25 !default;
+
+$input-bg:                       #fff !default;
+$input-bg-disabled:              $gray-lighter !default;
+
+$input-color:                    $gray !default;
+$input-border-color:             rgba(0,0,0,.15) !default;
+$input-btn-border-width:         $border-width !default; // For form controls and buttons
+$input-box-shadow:               inset 0 1px 1px rgba(0,0,0,.075) !default;
+
+$input-border-radius:            $border-radius !default;
+$input-border-radius-lg:         $border-radius-lg !default;
+$input-border-radius-sm:         $border-radius-sm !default;
+
+$input-bg-focus:                 $input-bg !default;
+$input-border-focus:             #66afe9 !default;
+$input-box-shadow-focus:         $input-box-shadow, 0 0 8px rgba(102,175,233,.6) !default;
+$input-color-focus:              $input-color !default;
+
+$input-color-placeholder:        #999 !default;
+
+$input-padding-x-sm:             .5rem !default;
+$input-padding-y-sm:             .25rem !default;
+
+$input-padding-x-lg:             1.5rem !default;
+$input-padding-y-lg:             .75rem !default;
+
+$input-height:                   (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default;
+$input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
+$input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
+
+$form-group-margin-bottom:       $spacer-y !default;
+
+$input-group-addon-bg:           $gray-lighter !default;
+$input-group-addon-border-color: $input-border-color !default;
+
+$cursor-disabled:                not-allowed !default;
+
+$custom-control-gutter:   1.5rem !default;
+$custom-control-spacer-x: 1rem !default;
+$custom-control-spacer-y: .25rem !default;
+
+$custom-control-indicator-size:       1rem !default;
+$custom-control-indicator-bg:         #ddd !default;
+$custom-control-indicator-bg-size:    50% 50% !default;
+$custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba(0,0,0,.1) !default;
+
+$custom-control-disabled-cursor:             $cursor-disabled !default;
+$custom-control-disabled-indicator-bg:       #eee !default;
+$custom-control-disabled-description-color:  #767676 !default;
+
+$custom-control-checked-indicator-color:      #fff !default;
+$custom-control-checked-indicator-bg:         #0074d9 !default;
+$custom-control-checked-indicator-box-shadow: none !default;
+
+$custom-control-focus-indicator-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default;
+
+$custom-control-active-indicator-color:      #fff !default;
+$custom-control-active-indicator-bg:         #84c6ff !default;
+$custom-control-active-indicator-box-shadow: none !default;
+
+$custom-checkbox-radius: $border-radius !default;
+$custom-checkbox-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E") !default;
+
+$custom-checkbox-indeterminate-bg: #0074d9 !default;
+$custom-checkbox-indeterminate-indicator-color: $custom-control-checked-indicator-color !default;
+$custom-checkbox-indeterminate-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E") !default;
+$custom-checkbox-indeterminate-box-shadow: none !default;
+
+$custom-radio-radius: 50% !default;
+$custom-radio-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E") !default;
+
+$custom-select-padding-x:          .75rem  !default;
+$custom-select-padding-y:          .375rem !default;
+$custom-select-indicator-padding:  1rem !default; // Extra padding to account for the presence of the background-image based indicator
+$custom-select-color:          $input-color !default;
+$custom-select-disabled-color: $gray-light !default;
+$custom-select-bg:            #fff !default;
+$custom-select-disabled-bg:   $gray-lighter !default;
+$custom-select-bg-size:       8px 10px !default; // In pixels because image dimensions
+$custom-select-indicator-color: #333 !default;
+$custom-select-indicator:     url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") !default;
+$custom-select-border-width:  $input-btn-border-width !default;
+$custom-select-border-color:  $input-border-color !default;
+$custom-select-border-radius: $border-radius !default;
+
+$custom-select-focus-border-color: #51a7e8 !default;
+$custom-select-focus-box-shadow:   inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default;
+
+$custom-select-sm-padding-y: .2rem !default;
+$custom-select-sm-font-size: 75% !default;
+
+$custom-file-height:           2.5rem !default;
+$custom-file-width:            14rem !default;
+$custom-file-focus-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default;
+
+$custom-file-padding-x:     .5rem !default;
+$custom-file-padding-y:     1rem !default;
+$custom-file-line-height:   1.5 !default;
+$custom-file-color:         #555 !default;
+$custom-file-bg:            #fff !default;
+$custom-file-border-width:  $border-width !default;
+$custom-file-border-color:  #ddd !default;
+$custom-file-border-radius: $border-radius !default;
+$custom-file-box-shadow:    inset 0 .2rem .4rem rgba(0,0,0,.05) !default;
+$custom-file-button-color:  $custom-file-color !default;
+$custom-file-button-bg:     #eee !default;
+$custom-file-text: (
+        placeholder: (
+                en: "Choose file..."
+        ),
+        button-label: (
+                en: "Browse"
+        )
+) !default;
+
+
+// Form validation icons
+$form-icon-success-color: $brand-success !default;
+$form-icon-success: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E") !default;
+
+$form-icon-warning-color: $brand-warning !default;
+$form-icon-warning: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-warning-color}' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E") !default;
+
+$form-icon-danger-color: $brand-danger !default;
+$form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E") !default;
+
+
+// Dropdowns
+//
+// Dropdown menu container and contents.
+
+$dropdown-min-width:             10rem !default;
+$dropdown-padding-y:             .5rem !default;
+$dropdown-margin-top:            .125rem !default;
+$dropdown-bg:                    #fff !default;
+$dropdown-border-color:          rgba(0,0,0,.15) !default;
+$dropdown-border-width:          $border-width !default;
+$dropdown-divider-bg:            #e5e5e5 !default;
+$dropdown-box-shadow:            0 .5rem 1rem rgba(0,0,0,.175) !default;
+
+$dropdown-link-color:            $gray-dark !default;
+$dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
+$dropdown-link-hover-bg:         #f5f5f5 !default;
+
+$dropdown-link-active-color:     $component-active-color !default;
+$dropdown-link-active-bg:        $component-active-bg !default;
+
+$dropdown-link-disabled-color:   $gray-light !default;
+
+$dropdown-item-padding-x:        0.5rem !default;
+
+$dropdown-header-color:          $gray-light !default;
+
+
+// Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+
+$zindex-dropdown-backdrop:  990 !default;
+$zindex-navbar:            1000 !default;
+$zindex-dropdown:          1000 !default;
+$zindex-popover:           1060 !default;
+$zindex-tooltip:           1070 !default;
+$zindex-navbar-fixed:      1030 !default;
+$zindex-navbar-sticky:     1030 !default;
+$zindex-modal-bg:          1040 !default;
+$zindex-modal:             1050 !default;
+
+
+// Navbar
+
+$navbar-border-radius:              $border-radius !default;
+$navbar-padding-x:                  $spacer !default;
+$navbar-padding-y:                  ($spacer / 2) !default;
+$navbar-brand-padding-y:            .25rem !default;
+
+$navbar-dark-color:                 rgba(255,255,255,1) !default;
+$navbar-dark-hover-color:           rgba(255,255,255,1) !default;
+$navbar-dark-active-color:          rgba(255,255,255,1) !default;
+$navbar-dark-disabled-color:        rgba(255,255,255,.25) !default;
+$navbar-dark-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default;
+
+$navbar-light-color:                rgba(0,0,0,.3) !default;
+$navbar-light-hover-color:          rgba(0,0,0,.6) !default;
+$navbar-light-active-color:         rgba(0,0,0,.8) !default;
+$navbar-light-disabled-color:       rgba(0,0,0,.15) !default;
+$navbar-light-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default;
+
+
+// Navs
+
+$nav-item-margin:               .2rem !default;
+$nav-item-inline-spacer:        1rem !default;
+$nav-link-padding:              .5em 1em !default;
+$nav-link-hover-bg:             $gray-lighter !default;
+$nav-disabled-link-color:       $gray-light !default;
+$nav-disabled-link-hover-color: $gray-light !default;
+$nav-disabled-link-hover-bg:    transparent !default;
+
+$nav-tabs-border-color:                       #ddd !default;
+$nav-tabs-border-width:                       $border-width !default;
+$nav-tabs-border-radius:                      $border-radius !default;
+$nav-tabs-link-hover-border-color:            $gray-lighter !default;
+$nav-tabs-active-link-hover-color:            $gray !default;
+$nav-tabs-active-link-hover-bg:               $body-bg !default;
+$nav-tabs-active-link-hover-border-color:     #ddd !default;
+$nav-tabs-justified-link-border-color:        #ddd !default;
+$nav-tabs-justified-active-link-border-color: $body-bg !default;
+
+$nav-pills-border-radius:     $border-radius !default;
+$nav-pills-active-link-color: $component-active-color !default;
+$nav-pills-active-link-bg:    $component-active-bg !default;
+
+
+// Pagination
+
+$pagination-padding-x:                .75rem !default;
+$pagination-padding-y:                .5rem !default;
+$pagination-padding-x-sm:             .75rem !default;
+$pagination-padding-y-sm:             .275rem !default;
+$pagination-padding-x-lg:             1.5rem !default;
+$pagination-padding-y-lg:             .75rem !default;
+
+
+$pagination-color:                     $link-color !default;
+$pagination-bg:                        #fff !default;
+$pagination-border-width:              $border-width !default;
+$pagination-border-color:              #ddd !default;
+
+$pagination-hover-color:               $link-hover-color !default;
+$pagination-hover-bg:                  $gray-lighter !default;
+$pagination-hover-border:              #ddd !default;
+
+$pagination-active-color:              #fff !default;
+$pagination-active-bg:                 $brand-primary !default;
+$pagination-active-border:             $brand-primary !default;
+
+$pagination-disabled-color:            $gray-light !default;
+$pagination-disabled-bg:               #fff !default;
+$pagination-disabled-border:           #ddd !default;
+
+
+// Jumbotron
+
+$jumbotron-padding:              2rem !default;
+$jumbotron-bg:                   $gray-lighter !default;
+
+
+// Form states and alerts
+//
+// Define colors for form feedback states and, by default, alerts.
+
+$state-success-text:             #3c763d !default;
+$state-success-bg:               #dff0d8 !default;
+$state-success-border:           darken($state-success-bg, 5%) !default;
+
+$state-info-text:                #31708f !default;
+$state-info-bg:                  #d9edf7 !default;
+$state-info-border:              darken($state-info-bg, 7%) !default;
+
+$state-warning-text:             #8a6d3b !default;
+$state-warning-bg:               #fcf8e3 !default;
+$mark-bg:                        $state-warning-bg !default;
+$state-warning-border:           darken($state-warning-bg, 5%) !default;
+
+$state-danger-text:              #a94442 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken($state-danger-bg, 5%) !default;
+
+
+// Cards
+$card-spacer-x:            1.25rem !default;
+$card-spacer-y:            .75rem !default;
+$card-border-width:        1px !default;
+$card-border-radius:       $border-radius !default;
+$card-border-color:        rgba(0,0,0,.125) !default;
+$card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default;
+$card-cap-bg:              #f5f5f5 !default;
+$card-bg:                  #fff !default;
+
+$card-link-hover-color:    #fff !default;
+
+$card-img-overlay-padding: 1.25rem !default;
+
+$card-deck-margin:         .625rem !default;
+
+$card-columns-sm-up-column-gap: 1.25rem !default;
+
+
+// Tooltips
+
+$tooltip-max-width:           200px !default;
+$tooltip-color:               #fff !default;
+$tooltip-bg:                  #000 !default;
+$tooltip-opacity:             .9 !default;
+$tooltip-padding-y:           3px !default;
+$tooltip-padding-x:           8px !default;
+$tooltip-margin:              3px !default;
+
+$tooltip-arrow-width:         5px !default;
+$tooltip-arrow-color:         $tooltip-bg !default;
+
+
+// Popovers
+
+$popover-inner-padding:               1px !default;
+$popover-bg:                          #fff !default;
+$popover-max-width:                   276px !default;
+$popover-border-width:                $border-width !default;
+$popover-border-color:                rgba(0,0,0,.2) !default;
+$popover-box-shadow:                  0 5px 10px rgba(0,0,0,.2) !default;
+
+$popover-title-bg:                    darken($popover-bg, 3%) !default;
+$popover-title-padding-x:             14px !default;
+$popover-title-padding-y:             8px !default;
+
+$popover-content-padding-x:           14px !default;
+$popover-content-padding-y:           9px !default;
+
+$popover-arrow-width:                 10px !default;
+$popover-arrow-color:                 $popover-bg !default;
+
+$popover-arrow-outer-width:           ($popover-arrow-width + 1px) !default;
+$popover-arrow-outer-color:           fade-in($popover-border-color, .05) !default;
+
+
+// Tags
+
+$tag-default-bg:            $gray-light !default;
+$tag-primary-bg:            $brand-primary !default;
+$tag-success-bg:            $brand-success !default;
+$tag-info-bg:               $brand-info !default;
+$tag-warning-bg:            $brand-warning !default;
+$tag-danger-bg:             $brand-danger !default;
+
+$tag-color:                 #fff !default;
+$tag-link-hover-color:      #fff !default;
+$tag-font-size:             75% !default;
+$tag-font-weight:           bold !default;
+$tag-padding-x:             .4em !default;
+$tag-padding-y:             .25em !default;
+
+$tag-pill-padding-x:        .6em !default;
+// Use a higher than normal value to ensure completely rounded edges when
+// customizing padding or font-size on labels.
+$tag-pill-border-radius:    10rem !default;
+
+// Modals
+
+// Padding applied to the modal body
+$modal-inner-padding:         15px !default;
+
+$modal-dialog-margin:         10px !default;
+$modal-dialog-sm-up-margin-y: 30px !default;
+
+$modal-title-padding:         15px !default;
+$modal-title-line-height:     $line-height-base !default;
+
+$modal-content-bg:               #fff !default;
+$modal-content-border-color:     rgba(0,0,0,.2) !default;
+$modal-content-border-width:     $border-width !default;
+$modal-content-xs-box-shadow:    0 3px 9px rgba(0,0,0,.5) !default;
+$modal-content-sm-up-box-shadow: 0 5px 15px rgba(0,0,0,.5) !default;
+
+$modal-backdrop-bg:           #000 !default;
+$modal-backdrop-opacity:      .5 !default;
+$modal-header-border-color:   #e5e5e5 !default;
+$modal-footer-border-color:   $modal-header-border-color !default;
+$modal-header-border-width:   $modal-content-border-width !default;
+$modal-footer-border-width:   $modal-header-border-width !default;
+
+$modal-lg:                    900px !default;
+$modal-md:                    600px !default;
+$modal-sm:                    300px !default;
+
+
+// Alerts
+//
+// Define alert colors, border radius, and padding.
+
+$alert-padding:               1rem !default;
+$alert-border-radius:         $border-radius !default;
+$alert-link-font-weight:      bold !default;
+$alert-border-width:          $border-width !default;
+
+$alert-success-bg:            $state-success-bg !default;
+$alert-success-text:          $state-success-text !default;
+$alert-success-border:        $state-success-border !default;
+
+$alert-info-bg:               $state-info-bg !default;
+$alert-info-text:             $state-info-text !default;
+$alert-info-border:           $state-info-border !default;
+
+$alert-warning-bg:            $state-warning-bg !default;
+$alert-warning-text:          $state-warning-text !default;
+$alert-warning-border:        $state-warning-border !default;
+
+$alert-danger-bg:             $state-danger-bg !default;
+$alert-danger-text:           $state-danger-text !default;
+$alert-danger-border:         $state-danger-border !default;
+
+
+// Progress bars
+
+$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-bar-bg:             $brand-primary !default;
+$progress-bar-success-bg:     $brand-success !default;
+$progress-bar-warning-bg:     $brand-warning !default;
+$progress-bar-danger-bg:      $brand-danger !default;
+$progress-bar-info-bg:        $brand-info !default;
+
+
+// List group
+
+$list-group-bg:                 #fff !default;
+$list-group-border-color:       #ddd !default;
+$list-group-border-width:       $border-width !default;
+$list-group-border-radius:      $border-radius !default;
+
+$list-group-hover-bg:           #f5f5f5 !default;
+$list-group-active-color:       $component-active-color !default;
+$list-group-active-bg:          $component-active-bg !default;
+$list-group-active-border:      $list-group-active-bg !default;
+$list-group-active-text-color:  lighten($list-group-active-bg, 40%) !default;
+
+$list-group-disabled-color:      $gray-light !default;
+$list-group-disabled-bg:         $gray-lighter !default;
+$list-group-disabled-text-color: $list-group-disabled-color !default;
+
+$list-group-link-color:         #555 !default;
+$list-group-link-hover-color:   $list-group-link-color !default;
+$list-group-link-heading-color: #333 !default;
+
+$list-group-item-padding-x:             1.25rem !default;
+$list-group-item-padding-y:             .75rem !default;
+$list-group-item-heading-margin-bottom: 5px !default;
+
+
+// Image thumbnails
+
+$thumbnail-padding:           .25rem !default;
+$thumbnail-bg:                $body-bg !default;
+$thumbnail-border-width:      $border-width !default;
+$thumbnail-border-color:      #ddd !default;
+$thumbnail-border-radius:     $border-radius !default;
+$thumbnail-box-shadow:        0 1px 2px rgba(0,0,0,.075) !default;
+
+
+// Figures
+
+$figure-caption-font-size: 90% !default;
+
+
+// Breadcrumbs
+
+$breadcrumb-padding-y:          .75rem !default;
+$breadcrumb-padding-x:          1rem !default;
+$breadcrumb-item-padding:       .5rem !default;
+
+$breadcrumb-bg:                 $gray-lighter !default;
+$breadcrumb-divider-color:      $gray-light !default;
+$breadcrumb-active-color:       $gray-light !default;
+$breadcrumb-divider:            "/" !default;
+
+
+// Media objects
+
+$media-margin-top:            15px !default;
+$media-heading-margin-bottom:  5px !default;
+$media-alignment-padding-x:   10px !default;
+
+
+// Carousel
+
+$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
+
+$carousel-control-color:                      #fff !default;
+$carousel-control-width:                      15% !default;
+$carousel-control-sm-up-size:                 30px !default;
+$carousel-control-opacity:                    .5 !default;
+$carousel-control-font-size:                  20px !default;
+
+$carousel-indicators-width:                   60% !default;
+
+$carousel-indicator-size:                     10px !default;
+$carousel-indicator-active-size:              12px !default;
+$carousel-indicator-active-bg:                #fff !default;
+$carousel-indicator-border-color:             #fff !default;
+
+$carousel-caption-width:                      70% !default;
+$carousel-caption-sm-up-width:                60% !default;
+$carousel-caption-color:                      #fff !default;
+
+$carousel-icon-width:                         20px !default;
+
+
+// Close
+
+$close-font-weight:           bold !default;
+$close-color:                 #000 !default;
+$close-text-shadow:           0 1px 0 #fff !default;
+
+
+// Code
+
+$code-font-size:              90% !default;
+$code-padding-x:              .4rem !default;
+$code-padding-y:              .2rem !default;
+$code-color:                  #bd4147 !default;
+$code-bg:                     #f7f7f9 !default;
+
+$kbd-color:                   #fff !default;
+$kbd-bg:                      #333 !default;
+
+$pre-bg:                      #f7f7f9 !default;
+$pre-color:                   $gray-dark !default;
+$pre-border-color:            #ccc !default;
+$pre-scrollable-max-height:   340px !default;

+ 1 - 0
build/scss/_bootstrap_variables_old.scss

@@ -53,6 +53,7 @@ $brand-success:             #00a65a !default;
 $brand-info:                #00c0ef !default;
 $brand-warning:             #f39c12 !default;
 $brand-danger:              #dd4b39 !default;
+$brand-inverse:             $gray-dark !default;
 
 
 // Options

+ 4 - 254
build/scss/_dropdown.scss

@@ -3,270 +3,20 @@
  * -------------------------
  */
 
-/*Dropdowns in general*/
-.dropdown-menu {
-  box-shadow: none;
-  border-color: #eee;
-  > li > a {
-    color: #777;
-  }
-  > li > a > .glyphicon,
-  > li > a > .fa,
-  > li > a > .ion {
-    margin-right: 10px;
-  }
-  > li > a:hover {
-    background-color: lighten($gray, 5%);
-    color: #333;
-  }
-  > .divider {
-    background-color: #eee;
-  }
-}
-
-//Navbar custom dropdown menu
-.navbar-nav > .notifications-menu,
-.navbar-nav > .messages-menu,
-.navbar-nav > .tasks-menu {
-  //fix width and padding
-  > .dropdown-menu {
-    > li {
-      position: relative;
-    }
-    width: 280px;
-    //Remove padding and margins
-    padding: 0 0 0 0;
-    margin: 0;
-    top: 100%;
-  }
-  //Define header class
-  > .dropdown-menu > li.header {
-    @include border-radius-sides(4px, 4px, 0, 0);
-    background-color: #ffffff;
-    padding: 7px 10px;
-    border-bottom: 1px solid #f4f4f4;
-    color: #444444;
-    font-size: 14px;
-  }
-
-  //Define footer class
-  > .dropdown-menu > li.footer > a {
-    @include border-radius-sides(0, 0, 4px, 4px);
-    font-size: 12px;
-    background-color: #fff;
-    padding: 7px 10px;
-    border-bottom: 1px solid #eeeeee;
-    color: #444 !important;
-    @media (max-width: map-get($grid-breakpoints, sm)) {
-      background: #fff !important;
-      color: #444 !important;
-    }
+.dropdown-menu-lg {
+  min-width: 230px;
+  .dropdown-footer {
     text-align: center;
-    //Hover state
-    &:hover {
-      text-decoration: none;
-      font-weight: normal;
-    }
-  }
-
-  //Clear inner menu padding and margins
-  > .dropdown-menu > li .menu {
-    max-height: 200px;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    overflow-x: hidden;
-    > li > a {
-      display: block;
-      white-space: nowrap; /* Prevent text from breaking */
-      border-bottom: 1px solid #f4f4f4;
-      // Hove state
-      &:hover {
-        background: #f4f4f4;
-        text-decoration: none;
-      }
-    }
-  }
-}
-
-//Notifications menu
-.navbar-nav > .notifications-menu {
-  > .dropdown-menu > li .menu {
-    // Links inside the menu
-    > li > a {
-      color: #444444;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      padding: 10px;
-      // Icons inside the menu
-      > .glyphicon,
-      > .fa,
-      > .ion {
-        width: 20px;
-      }
-    }
-
-  }
-}
-
-//Messages menu
-.navbar-nav > .messages-menu {
-  //Inner menu
-  > .dropdown-menu > li .menu {
-    // Messages menu item
-    > li > a {
-      margin: 0;
-      //line-height: 20px;
-      padding: 10px 10px;
-      // User image
-      > div > img {
-        margin: auto 10px auto auto;
-        width: 40px;
-        height: 40px;
-      }
-      // Message heading
-      > h4 {
-        padding: 0;
-        margin: 0 0 0 45px;
-        color: #444444;
-        font-size: 15px;
-        position: relative;
-        // Small for message time display
-        > small {
-          color: #999999;
-          font-size: 10px;
-          position: absolute;
-          top: 0;
-          right: 0;
-        }
-      }
-
-      > p {
-        margin: 0 0 0 45px;
-        font-size: 12px;
-        color: #888888;
-      }
-
-      @include clearfix();
-
-    }
-
+    display: block;
   }
 }
 
-//Tasks menu
-.navbar-nav > .tasks-menu {
-  > .dropdown-menu > li .menu {
-    > li > a {
-      padding: 10px;
-
-      > h3 {
-        font-size: 14px;
-        padding: 0;
-        margin: 0 0 10px 0;
-        color: #666666;
-      }
-
-      > .progress {
-        padding: 0;
-        margin: 0;
-      }
-    }
-  }
-}
-
-//User menu
-.navbar-nav > .user-menu {
-  > .dropdown-menu {
-    @include border-top-radius(0);
-    padding: 1px 0 0 0;
-    border-top-width: 0;
-    width: 280px;
-
-    &,
-    > .user-body {
-      @include border-bottom-radius(4px);
-    }
-    // Header menu
-    > li.user-header {
-      height: 175px;
-      padding: 10px;
-      text-align: center;
-      // User image
-      > img {
-        z-index: 5;
-        height: 90px;
-        width: 90px;
-        border: 3px solid;
-        border-color: transparent;
-        border-color: rgba(255, 255, 255, 0.2);
-      }
-      > p {
-        z-index: 5;
-        color: #fff;
-        color: rgba(255, 255, 255, 0.8);
-        font-size: 17px;
-        //text-shadow: 2px 2px 3px #333333;
-        margin-top: 10px;
-        > small {
-          display: block;
-          font-size: 12px;
-        }
-      }
-    }
-
-    // Menu Body
-    > .user-body {
-      padding: 15px;
-      border-bottom: 1px solid #f4f4f4;
-      border-top: 1px solid #dddddd;
-      @include clearfix();
-      a {
-        color: #444 !important;
-        @media (max-width: map-get($grid-breakpoints, sm)) {
-          background: #fff !important;
-          color: #444 !important;
-        }
-      }
-    }
-
-    // Menu Footer
-    > .user-footer {
-      background-color: #f9f9f9;
-      padding: 10px;
-      @include clearfix();
-      .btn-default {
-        color: #666666;
-        &:hover {
-          @media (max-width: map-get($grid-breakpoints,sm)) {
-            background-color: #f9f9f9;
-          }
-        }
-      }
-    }
-  }
-  .user-image {
-    float: left;
-    width: 25px;
-    height: 25px;
-    border-radius: 50%;
-    margin-right: 10px;
-    margin-top: -2px;
-    @media (max-width: map-get($grid-breakpoints, xs)) {
-      float: none;
-      margin-right: 0;
-      margin-top: -8px;
-      line-height: 10px;
-    }
-  }
-}
 
 /* Add fade animation to dropdown menus by appending
  the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
 .open:not(.dropup) > .animated-dropdown-menu {
   backface-visibility: visible !important;
   @include animation(flipInX .7s both);
-
 }
 
 @keyframes flipInX {

+ 29 - 0
build/scss/_header.scss

@@ -12,9 +12,11 @@
     background: darken($brand-primary, 5%);
     transition: width $transition-speed $transition-fn;
     overflow: hidden;
+
     > .logo-mini {
       display: none;
     }
+
     @include media-breakpoint-up(md) {
       .sidebar-mini.sidebar-collapse & {
         width: $sidebar-mini-width;
@@ -40,8 +42,35 @@
   .nav-link {
     padding: $main-header-link-padding-y $main-header-link-padding-x;
   }
+
+  .has-img {
+    padding-top: $main-header-link-padding-y - 2;
+    padding-bottom: $main-header-link-padding-y - 2;
+  }
+
+  .navbar-nav[class*="-right"] {
+    .nav-item:first-of-type {
+      @media (max-width: breakpoint-max(md)) {
+        margin-left: 1rem;
+      }
+    }
+    .dropdown-menu {
+      margin-top: -3px;
+      right: 0;
+      left: auto;
+      @media (max-width: breakpoint-max(md)) {
+        left: 0;
+        right: auto;
+      }
+    }
+  }
 }
 
 .navbar-shadow {
   box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-img {
+  height: $main-header-height / 2;
+  width: auto;
 }

+ 34 - 17
build/scss/_layout.scss

@@ -19,9 +19,8 @@ body,
 }
 
 .wrapper {
-  //min-height: 100%;
   .layout-boxed & {
-    box-shadow: 0 0 10px rgba(0,0,0,.3);
+    box-shadow: 0 0 10px rgba(0, 0, 0, .3);
     &,
     &:before {
       margin: 0 auto;
@@ -32,8 +31,8 @@ body,
 
 .wrapper:before,
 .main-sidebar:before {
-  content: "";
-  position: absolute;
+  content: " ";
+  position: fixed;
   top: 0;
   bottom: 0;
   z-index: -1;
@@ -44,11 +43,6 @@ body,
   width: 100%;
 }
 
-.main-sidebar:before {
-  left: 0;
-  width: $sidebar-width;
-}
-
 .content-wrapper,
 .main-footer {
   margin-left: $sidebar-width;
@@ -56,6 +50,12 @@ body,
   .sidebar-collapse & {
     margin-left: 0;
   }
+  @media(max-width: breakpoint-max(md)) {
+    &,
+    &:before {
+      margin-left: 0;
+    }
+  }
 }
 
 .content-wrapper,
@@ -63,6 +63,16 @@ body,
   @include calc("min-height", "100% - #{$main-header-height + $main-footer-height}");
 }
 
+.content-wrapper,
+.main-footer,
+.main-sidebar,
+.main-sidebar {
+  &,
+  &:before {
+    @include transition(margin-left $transition-speed $transition-fn);
+  }
+}
+
 .content-wrapper {
   background: $main-bg;
   > .content-header,
@@ -77,14 +87,27 @@ body,
 }
 
 .main-sidebar {
-  width: $sidebar-width;
   float: left;
+
+  &,
+  &:before {
+    @include transition(width $transition-speed $transition-fn);
+    width: $sidebar-width;
+  }
+
   .sidebar-collapse & {
     &,
     &:before {
       margin-left: -$sidebar-width;
     }
   }
+
+  @media(max-width: breakpoint-max(md)) {
+    &,
+    &:before {
+      margin-left: -$sidebar-width;
+    }
+  }
 }
 
 .main-footer {
@@ -92,13 +115,12 @@ body,
   color: #555;
   border-top: $main-footer-border-top;
   background: #fff;
-  margin-left: $sidebar-width;
 }
 
 .content-header {
   padding: 15px;
   background: #fff;
-  box-shadow: 3px 0 6px rgba(0, 0, 0, 0.2);
+  @include box-shadow(3px 0 6px rgba(0, 0, 0, 0.2));
   h1 {
     font-size: 1.8rem;
     margin: 0;
@@ -108,10 +130,5 @@ body,
     padding: 0;
     background: transparent;
     line-height: 1.8rem;
-    @include media-breakpoint-down(sm) {
-      float: none !important;
-      margin-top: 15px;
-      line-height: 1;
-    }
   }
 }

+ 9 - 0
build/scss/_miscellaneous.scss

@@ -546,6 +546,15 @@
   padding: 2px;
 }
 
+// Rounded and Circle Images
+.img-rounded {
+  @include border-radius($border-radius)
+}
+
+.img-circle {
+  @include border-radius(50%);
+}
+
 //General attachemnt block
 .attachment-block {
   border: 1px solid $box-border-color;

+ 48 - 13
build/scss/_mixins.scss

@@ -68,11 +68,6 @@
   }
 }
 
-// border radius creator
-@mixin border-radius($radius) {
-  border-radius: $radius;
-}
-
 @mixin translate($x, $y) {
   -webkit-transform: translate($x, $y);
   -ms-transform: translate($x, $y); // IE9 only
@@ -80,8 +75,7 @@
 }
 
 // Different radius each side
-@mixin border-radius-sides($top-left, $top-right, $bottom-left, $bottom-right)
-{
+@mixin border-radius-sides($top-left, $top-right, $bottom-left, $bottom-right) {
   border-radius: $top-left $top-right $bottom-left $bottom-right;
 }
 
@@ -117,12 +111,35 @@
   .main-sidebar:before {
     background-color: $sidebar-dark-bg;
   }
+
   // User Panel (resides in the sidebar)
   .user-panel {
-    > .info, > .info > a {
+    .info,
+    .status {
       color: #fff;
     }
+
+    .status {
+      color: $sidebar-dark-color;
+      background: $sidebar-dark-hover-bg;
+      &:hover,
+      &:focus,
+      &:active {
+        color: $sidebar-dark-hover-color;
+        background: darken($sidebar-dark-hover-bg, 3%);
+      }
+    }
+
+    .dropdown-menu {
+      border-color: darken($sidebar-dark-hover-bg, 5%);
+      @include box-shadow(0 2px 4px rgba(0,0,0,.4));
+    }
+
+    .dropdown-item {
+      color: $body-color;
+    }
   }
+
   // Sidebar Menu. First level links
   .nav-sidebar > .nav-item {
     // links
@@ -133,24 +150,32 @@
         color: $sidebar-dark-color;
       }
     }
+
     // Hover and active states
+    &.menu-open > .nav-link,
     &:hover > .nav-link,
-    &.active > .nav-link {
+    > .nav-link.active {
       color: $sidebar-dark-hover-color;
       background: $sidebar-dark-hover-bg;
+    }
+
+    > .nav-link.active {
       border-left-color: $link-hover-border-color;
     }
+
     // First Level Submenu
     > .nav-treeview {
       margin: 0 1px;
       background: $sidebar-dark-submenu-bg;
     }
   }
-  // Section Headning
+
+  // Section Heading
   .nav-header {
     color: darken($sidebar-dark-color, 20%);
-    background: inherit;//darken($sidebar-dark-bg, 3%);
+    background: inherit; //darken($sidebar-dark-bg, 3%);
   }
+
   // All links within the sidebar menu
   .sidebar a {
     color: $sidebar-dark-color;
@@ -158,21 +183,31 @@
       text-decoration: none;
     }
   }
+
   // All submenus
   .nav-treeview {
     > .nav-item {
       > .nav-link {
         color: $sidebar-dark-submenu-color;
       }
-      &.active > .nav-link,
-      > .navlink:hover {
+      > .nav-link.active,
+      > .nav-link:hover {
         color: $sidebar-dark-submenu-hover-color;
       }
     }
   }
+
   // Sidebar form
   .sidebar-form {
+    margin: 5px 0;
     .form-control {
+      &::-webkit-input-placeholder,
+      &:-moz-placeholder,
+      &::-moz-placeholder,
+      &:-ms-input-placeholder {
+        color: red;
+      }
+      font-size: 14px;
       background: $sidebar-dark-hover-bg;
       border: 0;
       color: $sidebar-dark-hover-color;

+ 22 - 5
build/scss/_sidebar-mini.scss

@@ -16,16 +16,30 @@
 
       // Modify the sidebar to shrink instead of disappearing
       .main-sidebar {
-        // Don't go away! Just shrink
-        @include translate(0, 0);
-        width: $sidebar-mini-width !important;
+        &,
+        &:before {
+          // Don't go away! Just shrink
+          margin-left: 0;
+          width: $sidebar-mini-width !important;
+        }
+
+        .user-panel {
+          margin-bottom: 10px;
+
+          .image {
+            float: none;
+          }
+        }
       }
 
       .nav-sidebar {
         > .nav-item {
           position: relative;
+          z-index: 999;
+
           > .nav-link {
             margin-right: 0;
+
             > .nav-icon {
               width: 100%;
               text-align: center;
@@ -52,15 +66,18 @@
             }
 
             // position the header & treeview menus
-            > .nav-link > span {
+            > .nav-link > .text {
               top: 0;
               margin-left: -3px;
               padding: $nav-link-padding;
               background-color: inherit;
+              border-top-right-radius: $border-radius;
             }
+
             > .nav-treeview {
               top: $nav-link-padding;
               margin-left: 0;
+              border-bottom-right-radius: $border-radius;
             }
           }
         }
@@ -83,11 +100,11 @@
 
 // A fix for text overflow while transitioning from sidebar mini to full sidebar
 .nav-sidebar,
-.main-sidebar .user-panel,
 .nav-sidebar > .nav-header {
   white-space: nowrap;
   overflow: hidden;
 }
+
 .nav-sidebar {
   position: relative;
   &:hover {

+ 56 - 63
build/scss/_sidebar.scss

@@ -2,93 +2,82 @@
  * Component: Sidebar
  * ------------------
  */
-//Main Sidebar
-.main-sidebar {
-  position: absolute;
-  top: $main-header-height;
-  left: 0;
-  @include calc("min-height", "100% - #{$main-header-height}");
-  z-index: 810;
-  width: $sidebar-width;
-  transition: transform $transition-speed $transition-fn,
-              width $transition-speed $transition-fn;
-  .layout-fixed & {
-    height: 100%;
-    overflow-y: auto;
-    padding-bottom: 55px;
-  }
-  /*@include media-breakpoint-down(md) {
-    @include translate(-$sidebar-width, 0);
-  }
-  .sidebar-collapse & {
-    @include media-breakpoint-up(md) {
-      @include translate(-$sidebar-width, 0);
-    }
-  }
-  .sidebar-open & {
-    @include media-breakpoint-down(md) {
-      @include translate(0, 0);
-    }
-  }*/
-}
 
 .sidebar {
   padding-bottom: 10px;
 }
+
 //Sidebar user panel
 .user-panel {
-  position: relative;
-  width: 100%;
-  padding: 10px;
-  overflow: hidden;
-  @include clearfix();
-  > .image > img {
+  padding: 10px 10px 0 10px;
+
+  .image {
+    float: left;
+  }
+
+  img {
     width: 100%;
     max-width: 45px;
     height: auto;
   }
-  > .info {
-    padding: 5px 5px 5px 15px;
-    line-height: 1;
-    position: absolute;
-    left: 55px;
-    > p {
-      font-weight: 600;
-      margin-bottom: 9px;
-    }
-    > a {
-      text-decoration: none;
-      padding-right: 5px;
-      margin-top: 3px;
-      font-size: 11px;
-      > .fa,
-      > .ion,
-      > .glyphicon {
-        margin-right: 3px;
-      }
+
+  .info {
+    padding: 5px 5px 5px 10px;
+    margin-left: 45px;
+  }
+
+  .status {
+    position: relative;
+    padding: 3px 7px;
+    border: 0;
+    > .fa,
+    > .ion,
+    > .glyphicon {
+      margin-right: 3px;
     }
   }
+
+  h6 {
+    overflow: hidden;
+    white-space: nowrap;
+    margin: 0 0 3px 0;
+  }
+
+  .status,
+  .dropdown-menu {
+    font-size: $font-size-sm;
+  }
+
+  .dropdown-menu {
+    position: absolute;
+    z-index: 99999999;
+  }
 }
 
-// Sidebar menu
+// Sidebar navigation menu
 .nav-sidebar {
   //First Level
   > .nav-item {
+    margin-bottom: 0;
+
     > .nav-link {
       @include border-radius(0);
       > .nav-icon {
         width: 20px;
       }
     }
+
     .pull-right {
       margin-top: 3px;
       margin-right: 5px;
     }
   }
+
   .nav-header {
     padding: $nav-link-padding;
-    font-size: .85em;
+    font-size: .9em;
   }
+
   // All other levels
   .nav-link > .fa-angle-left {
     width: auto;
@@ -97,16 +86,20 @@
     margin-right: 10px;
     margin-top: 3px;
   }
-  .nav-item.active {
-    > .nav-link {
-      font-weight: $display1-weight;
-    }
-    > .nav-link > .fa-angle-left {
-      @include rotate(-90deg);
-    }
+
+  .nav-item > .nav-link.active {
+    font-weight: $display1-weight;
+  }
+
+  .menu-open {
     > .nav-treeview {
       display: block;
     }
+    > .nav-link {
+      .fa-angle-left {
+        @include rotate(-90deg);
+      }
+    }
   }
 
   // Tree view menu

+ 5 - 5
build/scss/_variables.scss

@@ -43,25 +43,25 @@ $main-header-link-padding-y:  15px !default;
 $main-header-link-padding-x:  5px !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) + ($main-header-link-padding-y * 2)) !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) + ($main-footer-padding * 2)) + $main-footer-border-top-width !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: #222d32 !default;
+$sidebar-dark-bg: #2c333c !default;//#222d32 !default;
 $sidebar-dark-hover-bg: darken($sidebar-dark-bg, 2%) !default;
-$sidebar-dark-color: lighten($sidebar-dark-bg, 60%) !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: lighten($sidebar-dark-submenu-bg, 40%) !default;
+$sidebar-dark-submenu-color: #C2C7D0!default;//lighten($sidebar-dark-submenu-bg, 40%) !default;
 $sidebar-dark-submenu-hover-color: #fff !default;
 
 // Light sidebar

文件差異過大導致無法顯示
+ 13445 - 0
dist/css/adminlte.css


文件差異過大導致無法顯示
+ 137 - 0
dist/css/adminlte.css.map


文件差異過大導致無法顯示
+ 13 - 0
dist/css/adminlte.min.css


文件差異過大導致無法顯示
+ 137 - 0
dist/css/adminlte.min.css.map