]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Revert "Hollow button disabled consistency fix #9832" 9943/head
authorKevin Ball <kmball11@gmail.com>
Mon, 10 Apr 2017 16:25:04 +0000 (09:25 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Apr 2017 16:25:04 +0000 (09:25 -0700)
docs/pages/button.md
scss/components/_button.scss

index bfb2ab3b966a51da968bae0313098df23c1aae5d..9819d099862facd78782f32af60ad1ad1736913d 100644 (file)
@@ -108,9 +108,9 @@ The `.disabled` class will give buttons a faded appearance. The class is a purel
 
 ```html_example
 <a class="button disabled" href="#" aria-disabled>Disabled</a>
-<button type="button" class="button primary hollow" disabled>Disabled</button>
+<button type="button" class="button primary" disabled>Disabled</button>
 <button type="button" class="button secondary" disabled>Disabled</button>
-<button type="button" class="button success hollow" disabled>Disabled</button>
+<button type="button" class="button success" disabled>Disabled</button>
 <button type="button" class="button alert" disabled>Disabled</button>
 <button type="button" class="button warning" disabled>Disabled</button>
 ```
index cfd81dfa692bc1b70e367619a621a08bbb82e737..c5054c74a49271a89896c0239718ace10338b7ab 100644 (file)
@@ -177,11 +177,6 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
   &:hover, &:focus {
     border-color: $color-hover;
     color: $color-hover;
-    &.disabled,
-    &[disabled] {
-      border: $border-width solid $color;
-      color: $color;
-    }
   }
 }
 
@@ -308,31 +303,12 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
       }
     }
 
-    // Disabled style
-    &.disabled,
-    &[disabled] {
-      @include button-disabled;
-
-      @each $name, $color in $button-palette {
-        &.#{$name} {
-          @include button-disabled($color, auto);
-        }
-      }
-    }
-
     // Hollow style
     @if $button-fill != hollow {
       &.hollow {
         @include button-hollow;
         @include button-hollow-style;
 
-        &.disabled,
-        &[disabled] {
-          &, &:hover, &:focus {
-            background-color: transparent;
-          }
-        }
-
         @each $name, $color in $button-palette {
           &.#{$name} {
             @include button-hollow-style($color);
@@ -366,7 +342,7 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau
         }
       }
     }
-    
+
     // Dropdown arrow
     &.dropdown {
       @include button-dropdown;