From: canterberrie <christine@zurb.com>
Date: Mon, 10 Apr 2017 14:08:23 +0000 (-0700)
Subject: Merge branch 'develop' into hotfix/button-hollow-disabled
X-Git-Tag: v6.4.0-rc1~87^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9835%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into hotfix/button-hollow-disabled
---

764f6a8d2ee97495dd46d939013c7cb5399d1be6
diff --cc scss/components/_button.scss
index 5b9209cf6,c5054c74a..cfd81dfa6
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@@ -309,6 -317,32 +341,32 @@@ $button-transition: background-color 0.
        }
      }
  
+     // Clear style
+     @if $button-fill != clear {
+       &.clear {
+         @include button-clear;
+         @include button-clear-style;
+ 
+         @each $name, $color in $button-palette {
+           &.#{$name} {
+             @include button-clear-style($color);
+           }
+         }
+       }
+     }
+ 
+     // Disabled style
+     &.disabled,
+     &[disabled] {
+       @include button-disabled;
+ 
+       @each $name, $color in $button-palette {
+         &.#{$name} {
+           @include button-disabled($color, auto);
+         }
+       }
+     }
 -
++    
      // Dropdown arrow
      &.dropdown {
        @include button-dropdown;