]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Add float: left; to grid-column-unposition() mixin so it can properly uncenter a...
authorGeoff Kimball <geoff@zurb.com>
Mon, 4 Jan 2016 22:27:12 +0000 (14:27 -0800)
committerGeoff Kimball <geoff@zurb.com>
Mon, 4 Jan 2016 22:27:12 +0000 (14:27 -0800)
scss/components/_button.scss
scss/grid/_position.scss

index 8602dd0fcaae96ab7da01275b23e2fe403f64cde..535f5aba4a0a9ebf0e928ed9fd9c49cf07f7b9b1 100644 (file)
@@ -99,20 +99,13 @@ $button-opacity-disabled: 0.25 !default;
   $color: $button-color
 ) {
   @if $color == auto {
-    $color: isitlight($background);
+    $color: foreground($background);
   }
 
   @if $background-hover == auto {
     $background-hover: scale-color($background, $lightness: -20%);
   }
 
-  @if lightness($background) >= 70% {
-    $color: $button-color-alt;
-  }
-  @else {
-    $color: $button-color;
-  }
-
   background-color: $background;
   color: $color;
 
index da60ae697cf4150a24bf96f151ab288dd041bb35..7cb5d1b16bdb4d47f4bac79f1d7d9d312c4845d2 100644 (file)
@@ -31,6 +31,7 @@
   position: static;
   margin-left: 0;
   margin-right: 0;
+  float: left;
 }
 
 /// Offsets a column to the right by `$n` columns.