]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into hotfix/button-hollow-disabled 9835/head
authorcanterberrie <christine@zurb.com>
Mon, 10 Apr 2017 14:08:23 +0000 (07:08 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Apr 2017 14:08:23 +0000 (07:08 -0700)
1  2 
docs/pages/button.md
scss/components/_button.scss

Simple merge
index 5b9209cf6021d5254ddc7c5fefa0fe8d995ac5c6,c5054c74a49271a89896c0239718ace10338b7ab..cfd81dfa692bc1b70e367619a621a08bbb82e737
@@@ -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;