Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE

LMUFC · Sep 29, 2015 · 4cd707a · 4cd707a
2 parents 8a7a7ae + 5e66dfd
commit 4cd707a
Show file tree

Hide file tree

Showing 49 changed files with 1,966 additions and 59 deletions.
diff --git a/build/bootstrap-less/mixins.less b/build/bootstrap-less/mixins.less
@@ -10,6 +10,7 @@
 @import "mixins/responsive-visibility.less";
 @import "mixins/size.less";
 @import "mixins/tab-focus.less";
+@import "mixins/reset-text.less";
 @import "mixins/text-emphasis.less";
 @import "mixins/text-overflow.less";
 @import "mixins/vendor-prefixes.less";

diff --git a/build/bootstrap-less/mixins/background-variant.less b/build/bootstrap-less/mixins/background-variant.less
@@ -2,7 +2,8 @@
 
 .bg-variant(@color) {
   background-color: @color;
-  a&:hover {
+  a&:hover,
+  a&:focus {
     background-color: darken(@color, 10%);
   }
 }
diff --git a/build/bootstrap-less/mixins/buttons.less b/build/bootstrap-less/mixins/buttons.less
@@ -8,15 +8,31 @@
   background-color: @background;
   border-color: @border;
 
-  &:hover,
   &:focus,
-  &.focus,
+  &.focus {
+    color: @color;
+    background-color: darken(@background, 10%);
+    border-color: darken(@border, 25%);
+  }
+  &:hover {
+    color: @color;
+    background-color: darken(@background, 10%);
+    border-color: darken(@border, 12%);
+  }
   &:active,
   &.active,
   .open > .dropdown-toggle& {
     color: @color;
     background-color: darken(@background, 10%);
     border-color: darken(@border, 12%);
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: @color;
+      background-color: darken(@background, 17%);
+      border-color: darken(@border, 25%);
+    }
   }
   &:active,
   &.active,

diff --git a/build/bootstrap-less/mixins/grid.less b/build/bootstrap-less/mixins/grid.less
@@ -13,8 +13,8 @@
 
 // Creates a wrapper for a series of columns
 .make-row(@gutter: @grid-gutter-width) {
-  margin-left: (@gutter / -2);
-  margin-right: (@gutter / -2);
+  margin-left: ceil((@gutter / -2));
+  margin-right: floor((@gutter / -2));
   &:extend(.clearfix all);
 }
 

diff --git a/build/bootstrap-less/mixins/hide-text.less b/build/bootstrap-less/mixins/hide-text.less
@@ -1,6 +1,6 @@
 // CSS image replacement
 //
-// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
 // mixins being reused as classes with the same name, this doesn't hold up. As
 // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
 //

diff --git a/build/bootstrap-less/mixins/list-group.less b/build/bootstrap-less/mixins/list-group.less
@@ -5,7 +5,8 @@
     color: @color;
     background-color: @background;
 
-    a& {
+    a&,
+    button& {
       color: @color;
 
       .list-group-item-heading {

diff --git a/build/bootstrap-less/mixins/pagination.less b/build/bootstrap-less/mixins/pagination.less
@@ -1,11 +1,12 @@
 // Pagination
 
-.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
+.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
   > li {
     > a,
     > span {
       padding: @padding-vertical @padding-horizontal;
       font-size: @font-size;
+      line-height: @line-height;
     }
     &:first-child {
       > a,

diff --git a/build/bootstrap-less/mixins/reset-text.less b/build/bootstrap-less/mixins/reset-text.less
@@ -0,0 +1,18 @@
+.reset-text() {
+  font-family: @font-family-base;
+  // We deliberately do NOT reset font-size.
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: @line-height-base;
+  text-align: left; // Fallback for where `start` is not supported
+  text-align: start;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  white-space: normal;
+  word-break: normal;
+  word-spacing: normal;
+  word-wrap: normal;
+}
diff --git a/build/bootstrap-less/mixins/responsive-visibility.less b/build/bootstrap-less/mixins/responsive-visibility.less
@@ -5,7 +5,7 @@
 .responsive-visibility() {
   display: block !important;
   table& {
-    display: table;
+    display: table !important;
   }
   tr& {
     display: table-row !important;

diff --git a/build/bootstrap-less/mixins/text-emphasis.less b/build/bootstrap-less/mixins/text-emphasis.less
@@ -2,7 +2,8 @@
 
 .text-emphasis-variant(@color) {
   color: @color;
-  a&:hover {
+  a&:hover,
+  a&:focus {
     color: darken(@color, 10%);
   }
 }