Merge branch 'zcyzcy88-master'

Thank you
todc · Mar 29, 2017 · 5922f69 · 5922f69
2 parents 593fce1 + 1fd8cb8
commit 5922f69
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 37 deletions.
diff --git a/dist/css/todc-bootstrap.css b/dist/css/todc-bootstrap.css
diff --git a/dist/css/todc-bootstrap.css.map b/dist/css/todc-bootstrap.css.map
diff --git a/dist/css/todc-bootstrap.min.css b/dist/css/todc-bootstrap.min.css
diff --git a/dist/css/todc-bootstrap.min.css.map b/dist/css/todc-bootstrap.min.css.map
diff --git a/docs/dist/css/todc-bootstrap.css b/docs/dist/css/todc-bootstrap.css
diff --git a/docs/dist/css/todc-bootstrap.css.map b/docs/dist/css/todc-bootstrap.css.map
diff --git a/docs/dist/css/todc-bootstrap.min.css b/docs/dist/css/todc-bootstrap.min.css
diff --git a/docs/dist/css/todc-bootstrap.min.css.map b/docs/dist/css/todc-bootstrap.min.css.map
diff --git a/less/buttons.less b/less/buttons.less
@@ -19,7 +19,6 @@
     &:focus,
     &.focus {
       outline: none;
-      box-shadow: none;
     }
   }
 

diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less
@@ -39,8 +39,10 @@
   }
   &:focus,
   &.focus {
-    border: 1px solid @border-color;
-    .box-shadow(inset 0 0 0 1px #fff);
+    &:not(:active):not(.active) {
+      border: 1px solid @border-color;
+      .box-shadow(inset 0 0 0 1px #fff);
+    }
   }
   &.disabled,
   &[disabled],