Merge branch 'master' into v4m

2025-08-31 00:59:51 +02:00 · 2015-08-04 22:29:45 -07:00
parent 8ee9da2f54 ab412b2404
commit 1ddc3f5e21
42 changed files with 1101 additions and 1005 deletions
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -37,11 +37,8 @@
  &.disabled,
  &:disabled,
  fieldset[disabled] & {
-    &,
    &:focus,
-    &.focus,
-    &:active,
-    &.active {
+    &.focus {
      background-color: $background;
          border-color: $border;
    }