Browse Source

Add AdminLTE.css to css folder

Abdullah Almsaeed 9 years ago
parent
commit
f5f78f415b

+ 4 - 4
Gruntfile.js

@@ -19,7 +19,7 @@ module.exports = function (grunt) {
           style: 'expanded'
         },
         files: {
-          'dist/tmp/AdminLTE.css': 'build/scss/AdminLTE.scss'
+          'dist/css/AdminLTE.css': 'build/scss/AdminLTE.scss'
         }
       },
       production: {
@@ -27,7 +27,7 @@ module.exports = function (grunt) {
           style: 'compressed'
         },
         files: {
-          'dist/tmp/AdminLTE.min.css': 'build/scss/AdminLTE.scss'
+          'dist/css/AdminLTE.min.css': 'build/scss/AdminLTE.scss'
         }
       }
     },
@@ -103,10 +103,10 @@ module.exports = function (grunt) {
     // Validate CSS files
     csslint: {
       options: {
-        csslintrc: 'build/less/.csslintrc'
+        csslintrc: 'build/scss/.csslintrc'
       },
       dist: [
-        'dist/css/AdminLTE.css',
+        'dist/tmp/AdminLTE.css',
       ]
     },
 

+ 23 - 0
build/scss/.csslintrc

@@ -0,0 +1,23 @@
+{
+  "adjoining-classes": false,
+  "box-sizing": false,
+  "box-model": false,
+  "compatible-vendor-prefixes": false,
+  "floats": false,
+  "font-sizes": false,
+  "gradients": false,
+  "important": false,
+  "known-properties": false,
+  "outline-none": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "shorthand": false,
+  "text-indent": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false,
+  "ids": false,
+  "fallback-colors": false,
+  "vendor-prefix": false,
+  "import": false
+}

+ 5 - 0
build/scss/_boxes.scss

@@ -2,6 +2,11 @@
  * Component: Box
  * --------------
  */
+
+.card {
+  background: #fff;
+}
+
 .box {
   position: relative;
   @include border-radius($box-border-radius);

+ 14 - 13
build/scss/_core.scss

@@ -14,7 +14,6 @@ body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   overflow-x: hidden;
-  overflow-y: auto;
 }
 
 /* Layout */
@@ -38,33 +37,38 @@ body {
 
 /*
  * Content Wrapper - contains the main content
- * ```.right-side has been deprecated as of v2.0.0 in favor of .content-wrapper  ```
  */
+.content-wrapper {
+  min-height: 100%;
+}
 .content-wrapper,
-.right-side,
 .main-footer {
-  //Using disposable variable to join statements with a comma
-  $transition-rule: $transition-speed $transition-fn,
-  margin $transition-speed $transition-fn;
-transition: transform $transition-rule;
   margin-left: $sidebar-width;
   z-index: 820;
   //Top nav layout
   .layout-top-nav & {
     margin-left: 0;
   }
-  @media (max-width: map-get($grid-breakpoints, xs)) {
+  @media (max-width: map-get($grid-breakpoints, md) + 1) {
     margin-left: 0;
   }
   //When opening the sidebar on large screens
   .sidebar-collapse & {
-    @media (min-width: map-get($grid-breakpoints, sm)) {
+    @media (min-width: map-get($grid-breakpoints, md)) {
       margin-left: 0;
     }
   }
+}
+.main-header,
+.main-footer,
+.content-wrapper {
+  //Using disposable variable to join statements with a comma
+  $transition-rule: $transition-speed $transition-fn,
+  margin $transition-speed $transition-fn;
+  transition: transform $transition-rule;
   //When opening the sidebar on small screens
   .sidebar-open & {
-    @media (max-width: map-get($grid-breakpoints, xs)) {
+    @media (max-width: map-get($grid-breakpoints, md) + 1) {
       @include translate($sidebar-width, 0);
     }
   }
@@ -99,9 +103,6 @@ transition: transform $transition-rule;
   .content-wrapper,
   .right-side {
     padding-top: 50px;
-    @media (max-width: $screen-header-collapse) {
-      padding-top: 100px;
-    }
   }
   &.layout-boxed {
     .wrapper {

+ 7 - 15
build/scss/_header.scss

@@ -4,23 +4,15 @@
  */
 
 .main-header {
-  position: relative;
-  z-index: $zindex-navbar;
+  padding: 0 16px 0 0;
+  .navbar-brand {
+    width: $sidebar-width;
+    padding: 10px;
+  }
 
-  > .navbar {
-    //margin-left: $sidebar-width;
-    //height: 55px;
+  .nav-link {
+    padding: 15px 5px;
   }
-/*
-  > .logo {
-    width: $sidebar-width;
-    padding: 0 15px;
-    text-align: center;
-    float: left;
-    font-size: 18px;
-    height: 55px;
-    line-height: 55px;
-  }*/
 }
 
 .content-header {

+ 1 - 0
build/scss/_mixins.scss

@@ -74,6 +74,7 @@
 }
 
 @mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
   -ms-transform: translate($x, $y); // IE9 only
   transform: translate($x, $y);
 }

+ 6 - 7
build/scss/_sidebar.scss

@@ -5,8 +5,7 @@
 //Main Sidebar
 // ``` .left-side has been deprecated as of 2.0.0 in favor of .main-sidebar ```
 
-.main-sidebar,
-.left-side {
+.main-sidebar {
   position: absolute;
   top: 0;
   left: 0;
@@ -19,18 +18,18 @@
   width $transition-speed $transition-fn;
   transition: transform $transition-rule;
   @media (max-width: $screen-header-collapse) {
-    padding-top: 100px;
+    padding-top: 0;
   }
-  @media (max-width: map-get($grid-breakpoints, xs)) {
+  @media (max-width: map-get($grid-breakpoints, md) + 1) {
     @include translate(-$sidebar-width, 0);
   }
   .sidebar-collapse & {
-    @media (min-width: map-get($grid-breakpoints, sm)) {
+    @media (min-width: map-get($grid-breakpoints, md)) {
       @include translate(-$sidebar-width, 0);
     }
   }
   .sidebar-open & {
-    @media (max-width: map-get($grid-breakpoints, xs)) {
+    @media (max-width: map-get($grid-breakpoints, md) + 1) {
       @include translate(0, 0);
     }
   }
@@ -155,4 +154,4 @@
       }
     }
   }
-}
+}

+ 7 - 7
build/scss/_variables.scss

@@ -9,15 +9,15 @@ $boxed-layout-bg-image-path: "../img/boxed-bg.jpg";
 //COLORS
 //--------------------------------------------------------
 //Primary
-$light-blue: #3c8dbc;
+$light-blue: $brand-primary;//#3c8dbc;
 //Danger
-$red: #dd4b39;
+$red: $brand-danger; //#dd4b39;
 //Success
-$green: #00a65a;
+$green: $brand-success; //#00a65a;
 //Info
-$aqua: #00c0ef;
+$aqua: $brand-info; //#00c0ef;
 //Warning
-$yellow: #f39c12;
+$yellow: $brand-warning; //#f39c12;
 $blue: #0073b7;
 $navy: #001F3F;
 $teal: #39CCCC;
@@ -38,14 +38,14 @@ $sidebar-width: 230px;
 //Boxed layout maximum width
 $boxed-layout-max-width: 1024px;
 //When the logo should go to the top of the screen
-$screen-header-collapse: map-get($grid-breakpoints, xs);
+$screen-header-collapse: map-get($grid-breakpoints, md);
 
 //Link colors (aka: <a> tags)
 $link-color: $light-blue;
 $link-hover-color: lighten($link-color, 15%);
 
 //Body background (Affects main content background only)
-$main-bg: #ecf0f5;
+$main-bg: $gray-lighter; //#ecf0f5;
 
 //SIDEBAR SKINS
 //--------------------------------------------------------

File diff suppressed because it is too large
+ 9699 - 0
dist/css/AdminLTE.css


File diff suppressed because it is too large
+ 9699 - 0
dist/css/AdminLTE.min.css