Browse Source

Updated light skin logos

Abdullah Almsaeed 10 years ago
parent
commit
0fc9439050

+ 3 - 3
build/less/skins/skin-green-light.less

@@ -37,9 +37,9 @@
     }
     //Logo
     .logo {
-      .logo-variant(darken(@green, 5%));      
+      .logo-variant(@green);
     }
-    
+
     li.user-header {
       background-color: @green;
     }
@@ -49,7 +49,7 @@
   .content-header {
     background: transparent;
   }
-  
+
   //Create the sidebar skin
   .skin-light-sidebar(@green);
 

+ 2 - 2
build/less/skins/skin-purple-light.less

@@ -37,9 +37,9 @@
     }
     //Logo
     .logo {
-      .logo-variant(darken(@purple, 5%));      
+      .logo-variant(@purple);
     }
-    
+
     li.user-header {
       background-color: @purple;
     }

+ 1 - 1
build/less/skins/skin-red-light.less

@@ -37,7 +37,7 @@
     }
     //Logo
     .logo {
-      .logo-variant(darken(@red, 5%));      
+      .logo-variant(@red);      
     }
     
     li.user-header {

+ 1 - 1
build/less/skins/skin-yellow-light.less

@@ -37,7 +37,7 @@
     }
     //Logo
     .logo {
-      .logo-variant(darken(@yellow, 5%));      
+      .logo-variant(@yellow);      
     }
     
     li.user-header {

+ 5 - 5
dist/css/AdminLTE.css

@@ -1565,7 +1565,7 @@ a:focus {
   height: 100%;
 }
 .box .overlay {
-  z-index: 1010;
+  z-index: 50;
   background: rgba(255, 255, 255, 0.7);
   border-radius: 3px;
 }
@@ -2603,10 +2603,10 @@ table.text-center th {
   transform: translate(0, 0);
 }
 .direct-chat-contacts {
-  -webkit-transform: translate(100%, 0);
-  -ms-transform: translate(100%, 0);
-  -o-transform: translate(100%, 0);
-  transform: translate(100%, 0);
+  -webkit-transform: translate(101%, 0);
+  -ms-transform: translate(101%, 0);
+  -o-transform: translate(101%, 0);
+  transform: translate(101%, 0);
   position: absolute;
   top: 0;
   bottom: 0;

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


+ 8 - 8
dist/css/skins/_all-skins.css

@@ -813,12 +813,12 @@
   }
 }
 .skin-green-light .main-header .logo {
-  background-color: #008d4c;
+  background-color: #00a65a;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-green-light .main-header .logo:hover {
-  background: #008749;
+  background: #00a157;
 }
 .skin-green-light .main-header li.user-header {
   background-color: #00a65a;
@@ -1102,12 +1102,12 @@
   }
 }
 .skin-red-light .main-header .logo {
-  background-color: #d73925;
+  background-color: #dd4b39;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-red-light .main-header .logo:hover {
-  background: #d33724;
+  background: #dc4735;
 }
 .skin-red-light .main-header li.user-header {
   background-color: #dd4b39;
@@ -1391,12 +1391,12 @@
   }
 }
 .skin-yellow-light .main-header .logo {
-  background-color: #e08e0b;
+  background-color: #f39c12;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-yellow-light .main-header .logo:hover {
-  background: #db8b0b;
+  background: #f39a0d;
 }
 .skin-yellow-light .main-header li.user-header {
   background-color: #f39c12;
@@ -1680,12 +1680,12 @@
   }
 }
 .skin-purple-light .main-header .logo {
-  background-color: #555299;
+  background-color: #605ca8;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-purple-light .main-header .logo:hover {
-  background: #545096;
+  background: #5d59a6;
 }
 .skin-purple-light .main-header li.user-header {
   background-color: #605ca8;

File diff suppressed because it is too large
+ 1 - 1
dist/css/skins/_all-skins.min.css


+ 2 - 2
dist/css/skins/skin-green-light.css

@@ -42,12 +42,12 @@
   }
 }
 .skin-green-light .main-header .logo {
-  background-color: #008d4c;
+  background-color: #00a65a;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-green-light .main-header .logo:hover {
-  background: #008749;
+  background: #00a157;
 }
 .skin-green-light .main-header li.user-header {
   background-color: #00a65a;

File diff suppressed because it is too large
+ 1 - 1
dist/css/skins/skin-green-light.min.css


+ 2 - 2
dist/css/skins/skin-purple-light.css

@@ -42,12 +42,12 @@
   }
 }
 .skin-purple-light .main-header .logo {
-  background-color: #555299;
+  background-color: #605ca8;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-purple-light .main-header .logo:hover {
-  background: #545096;
+  background: #5d59a6;
 }
 .skin-purple-light .main-header li.user-header {
   background-color: #605ca8;

File diff suppressed because it is too large
+ 1 - 1
dist/css/skins/skin-purple-light.min.css


+ 2 - 2
dist/css/skins/skin-red-light.css

@@ -42,12 +42,12 @@
   }
 }
 .skin-red-light .main-header .logo {
-  background-color: #d73925;
+  background-color: #dd4b39;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-red-light .main-header .logo:hover {
-  background: #d33724;
+  background: #dc4735;
 }
 .skin-red-light .main-header li.user-header {
   background-color: #dd4b39;

File diff suppressed because it is too large
+ 1 - 1
dist/css/skins/skin-red-light.min.css


+ 2 - 2
dist/css/skins/skin-yellow-light.css

@@ -42,12 +42,12 @@
   }
 }
 .skin-yellow-light .main-header .logo {
-  background-color: #e08e0b;
+  background-color: #f39c12;
   color: #ffffff;
   border-bottom: 0px solid transparent;
 }
 .skin-yellow-light .main-header .logo:hover {
-  background: #db8b0b;
+  background: #f39a0d;
 }
 .skin-yellow-light .main-header li.user-header {
   background-color: #f39c12;

File diff suppressed because it is too large
+ 1 - 1
dist/css/skins/skin-yellow-light.min.css


+ 15 - 1
dist/js/app.js

@@ -393,6 +393,13 @@ function _init() {
           _this.close(sidebar, o.slide);
         }
       });
+
+      //If the body has a boxed layout, fix the sidebar bg position
+      if ($("body").hasClass('layout-boxed')) {
+        var bg = $(".control-sidebar-bg");
+        bg.css("position", "absolute");
+        _this._fix(bg);
+      }
     },
     //Open the control sidebar
     open: function (sidebar, slide) {
@@ -407,6 +414,13 @@ function _init() {
         sidebar.removeClass('control-sidebar-open');
       else
         $('body').removeClass('control-sidebar-open');
+    },
+    _fix: function (sidebar) {
+      var _this = this;
+      sidebar.height($(".wrapper").height());
+      $(window).resize(function () {
+        _this._fix(sidebar);
+      });
     }
   };
 
@@ -443,7 +457,7 @@ function _init() {
       //Find the body and the footer
       var box_content = box.find("> .box-body, > .box-footer");
       if (!box.hasClass("collapsed-box")) {
-        //Convert minus into plus        
+        //Convert minus into plus
         element.children(":first")
                 .removeClass(_this.icons.collapse)
                 .addClass(_this.icons.open);

File diff suppressed because it is too large
+ 1 - 1
dist/js/app.min.js


+ 1 - 0
dist/js/demo.js

@@ -246,6 +246,7 @@
   function change_layout(cls) {
     $("body").toggleClass(cls);
     $.AdminLTE.layout.fixSidebar();
+    //Fix the problem
   }
 
   /**

+ 10 - 10
documentation/build/include/components.html

@@ -408,7 +408,7 @@
   </nav>
 &LT;/header></pre>
 
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id='component-sidebar'>Sidebar</h3>
   <p class="lead">
@@ -460,7 +460,7 @@
 &LT;/div>&LT;!-- /.main-sidebar -->
   </pre>
 
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id="component-info-box">Info Box</h3>
   <p class="lead">Info boxes are used to display statistical snippets. There are two types of info boxes.</p>
@@ -599,7 +599,7 @@
 </code></pre>
   <p class="lead">The only thing you need to change to alternate between these style is change the placement of the bg-* class. For the 
     first style apply any bg-* class to the icon itself. For the other style, apply the bg-* class to the info-box div.</p>
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id='component-box'>Box</h3>
   <p class="lead">The box component is the most widely used component through out this template. You can
@@ -1051,7 +1051,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1122,7 +1122,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1193,7 +1193,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1264,7 +1264,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1339,7 +1339,7 @@
       &LT;ul class='contacts-list'>
         &LT;li>
           &LT;a href='#'>
-            &LT;img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+            &LT;img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
             &LT;div class='contacts-list-info'>
               &LT;span class='contacts-list-name'>
                 Count Dracula
@@ -1412,7 +1412,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1483,7 +1483,7 @@
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula

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

@@ -1,5 +1,5 @@
 <section id="license">
-  <h1 class="page-header"><a href="#license">License</a></h1>
+  <h2 class="page-header"><a href="#license">License</a></h2>
   <h3>AdminLTE</h3>
   <p class="lead">AdminLTE is an open source project that is licensed under the <a href="http://opensource.org/licenses/MIT">MIT license</a>.
     This allows you to do pretty much anything you want as long as you include the copyright in "all copies or substantial portions of the Software."

+ 2 - 2
documentation/build/index.html

@@ -53,7 +53,7 @@
       <!-- Left side column. contains the logo and sidebar -->
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar" id="scrollspy">
+        <div class="sidebar" id="scrollspy">
 
           <!-- sidebar menu: : style can be found in sidebar.less -->
           <ul class="nav sidebar-menu">
@@ -79,7 +79,7 @@
             <li><a href="#faq"><i class='fa fa-circle-o'></i> FAQ</a></li>
             <li><a href="#license"><i class='fa fa-circle-o'></i> License</a></li>
           </ul>
-        </section>
+        </div>
         <!-- /.sidebar -->
       </aside>
 

+ 13 - 13
documentation/index.html

@@ -53,7 +53,7 @@
       <!-- Left side column. contains the logo and sidebar -->
       <aside class="main-sidebar">
         <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar" id="scrollspy">
+        <div class="sidebar" id="scrollspy">
 
           <!-- sidebar menu: : style can be found in sidebar.less -->
           <ul class="nav sidebar-menu">
@@ -79,7 +79,7 @@
             <li><a href="#faq"><i class='fa fa-circle-o'></i> FAQ</a></li>
             <li><a href="#license"><i class='fa fa-circle-o'></i> License</a></li>
           </ul>
-        </section>
+        </div>
         <!-- /.sidebar -->
       </aside>
 
@@ -1050,7 +1050,7 @@ AdminLTE/
   &LT;/nav>
 &LT;/header></pre>
 
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id='component-sidebar'>Sidebar</h3>
   <p class="lead">
@@ -1102,7 +1102,7 @@ AdminLTE/
 &LT;/div>&LT;!-- /.main-sidebar -->
   </pre>
 
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id="component-info-box">Info Box</h3>
   <p class="lead">Info boxes are used to display statistical snippets. There are two types of info boxes.</p>
@@ -1241,7 +1241,7 @@ AdminLTE/
 </code></pre>
   <p class="lead">The only thing you need to change to alternate between these style is change the placement of the bg-* class. For the 
     first style apply any bg-* class to the icon itself. For the other style, apply the bg-* class to the info-box div.</p>
-  <!-- ----------------------------------------------------------- -->
+  <!-- ===================================================================== -->
 
   <h3 id='component-box'>Box</h3>
   <p class="lead">The box component is the most widely used component through out this template. You can
@@ -1693,7 +1693,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1764,7 +1764,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1835,7 +1835,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1906,7 +1906,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -1981,7 +1981,7 @@ AdminLTE/
       &LT;ul class='contacts-list'>
         &LT;li>
           &LT;a href='#'>
-            &LT;img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+            &LT;img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
             &LT;div class='contacts-list-info'>
               &LT;span class='contacts-list-name'>
                 Count Dracula
@@ -2054,7 +2054,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -2125,7 +2125,7 @@ AdminLTE/
             <ul class='contacts-list'>
               <li>
                 <a href='#'>
-                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg'/>
+                  <img class='contacts-list-img' src='../dist/img/user1-128x128.jpg' alt="Contact Avatar"/>
                   <div class='contacts-list-info'>
                     <span class='contacts-list-name'>
                       Count Dracula
@@ -2270,7 +2270,7 @@ AdminLTE/
           <!-- ============================================================= -->
 
 <section id="license">
-  <h1 class="page-header"><a href="#license">License</a></h1>
+  <h2 class="page-header"><a href="#license">License</a></h2>
   <h3>AdminLTE</h3>
   <p class="lead">AdminLTE is an open source project that is licensed under the <a href="http://opensource.org/licenses/MIT">MIT license</a>.
     This allows you to do pretty much anything you want as long as you include the copyright in "all copies or substantial portions of the Software."