浏览代码

Merge master

Abdullah Almsaeed 10 年之前
父节点
当前提交
2f72188c28

+ 1 - 1
build/less/.csslintrc

@@ -20,4 +20,4 @@
   "fallback-colors": false,
   "fallback-colors": false,
   "vendor-prefix": false,
   "vendor-prefix": false,
   "import": false
   "import": false
-}
+}

+ 1 - 1
build/less/control-sidebar.less

@@ -167,7 +167,7 @@
         &:hover,
         &:hover,
           &:focus {
           &:focus {
           border-left-color: darken(@sidebar-dark-bg, 7%);
           border-left-color: darken(@sidebar-dark-bg, 7%);
-          border-bottom-color: darken(@sidebar-dark-bg, 7%);          
+          border-bottom-color: darken(@sidebar-dark-bg, 7%);
         }
         }
         &:hover,
         &:hover,
           &:focus,
           &:focus,

+ 6 - 6
build/less/core.less

@@ -111,12 +111,12 @@ body {
   }
   }
 }
 }
 
 
-body.hold-transition { 
-    .content-wrapper, 
-    .right-side, 
-    .main-footer, 
-    .main-sidebar, 
-    .left-side, 
+body.hold-transition {
+    .content-wrapper,
+    .right-side,
+    .main-footer,
+    .main-sidebar,
+    .left-side,
     .main-header > .navbar,
     .main-header > .navbar,
     .main-header .logo {
     .main-header .logo {
       /* Fix for IE */
       /* Fix for IE */

+ 1 - 1
build/less/dropdown.less

@@ -98,7 +98,7 @@
       color: #444444;
       color: #444444;
       overflow: hidden;
       overflow: hidden;
       text-overflow: ellipsis;
       text-overflow: ellipsis;
-      padding: 10px;      
+      padding: 10px;
       // Icons inside the menu
       // Icons inside the menu
       > .glyphicon,
       > .glyphicon,
       > .fa,
       > .fa,

+ 1 - 1
build/less/miscellaneous.less

@@ -282,7 +282,7 @@
   > .list-group-item {
   > .list-group-item {
     border-left: 0;
     border-left: 0;
     border-right: 0;
     border-right: 0;
-    border-radius: 0; 
+    border-radius: 0;
     padding-left: 0;
     padding-left: 0;
     padding-right: 0;
     padding-right: 0;
   }
   }

+ 1 - 1
build/less/navs.less

@@ -215,7 +215,7 @@
 .pagination {
 .pagination {
   > li > a {
   > li > a {
     background: #fafafa;
     background: #fafafa;
-    color: #666;    
+    color: #666;
   }
   }
   &.pagination-flat {
   &.pagination-flat {
     > li > a {
     > li > a {

+ 1 - 1
build/less/print.less

@@ -18,7 +18,7 @@
   .content-wrapper,
   .content-wrapper,
   .right-side,
   .right-side,
   .main-footer {
   .main-footer {
-    margin-left: 0!important;    
+    margin-left: 0!important;
     min-height: 0!important;
     min-height: 0!important;
     .translate(0,0)!important;
     .translate(0,0)!important;
   }
   }

+ 1 - 1
build/less/social-widgets.less

@@ -75,4 +75,4 @@
       float: left;
       float: left;
     }
     }
   }
   }
-}
+}

+ 1 - 1
documentation/build/include/dependencies.html

@@ -7,4 +7,4 @@
     <li><a href="http://jquery.com/" target="_blank">jQuery 1.11+</a></li>
     <li><a href="http://jquery.com/" target="_blank">jQuery 1.11+</a></li>
     <li><a href="#plugins">All other plugins are listed below</a></li>
     <li><a href="#plugins">All other plugins are listed below</a></li>
   </ul>
   </ul>
-</section>
+</section>

+ 1 - 0
documentation/index.html

@@ -182,6 +182,7 @@ AdminLTE/
   </ul>
   </ul>
 </section>
 </section>
 
 
+
 <!-- ============================================================= -->
 <!-- ============================================================= -->
 
 
 <section id="advice">
 <section id="advice">

+ 1 - 1
pages/examples/invoice-print.html

@@ -152,4 +152,4 @@
       </section><!-- /.content -->
       </section><!-- /.content -->
     </div><!-- ./wrapper -->
     </div><!-- ./wrapper -->
   </body>
   </body>
-</html>
+</html>

+ 1 - 1
starter.html

@@ -372,4 +372,4 @@ scratch. This page gets rid of all links and provides the needed markup only.
          user experience. Slimscroll is required when using the
          user experience. Slimscroll is required when using the
          fixed layout. -->
          fixed layout. -->
   </body>
   </body>
-</html>
+</html>