Merge branch 'develop' of git://github.com/artursopelnik/foundation-sites into arturs...

diff --cc scss/components/_button.scss
index 499f6dd248a4d4c084aa60e10c223b60c3f095f6,1b2a2700aaa3cee7ba475a89740c7c492b302ce6..eb266c59475c0895e71c24a97d8b7cec34b6eec9
--- 1/scss/components/_button.scss
--- 2/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@@ -162,14 -159,6 +167,14 @@@ $button-transition: background-color 0.
    &:hover, &:focus {
      background-color: transparent;
    }
-     &, 
 +
 +  &.disabled,
 +  &[disabled] {
++    &,
 +    &:hover, &:focus {
 +      background-color: transparent;
 +    }
 +  }
  }
  
  @mixin button-hollow-style(