adding back in the amends

kyan · Dec 23, 2014 · 6236fc7 · 6236fc7
1 parent e19113c
commit 6236fc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/vendor/assets/stylesheets/foundation/components/_forms.scss b/vendor/assets/stylesheets/foundation/components/_forms.scss
@@ -3,7 +3,6 @@
 // Licensed under MIT Open Source
 
 @import "global";
-@import "buttons";
 
 //
 // @variables
@@ -397,8 +396,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
     .postfix { @include prefix-postfix-base; }
 
     /* Adjust padding, alignment and radius if pre/post element is a button */
-    .postfix.button { @include button-size(false,false); @include postfix(false, false, true); }
-    .prefix.button { @include button-size(false,false); @include prefix(false, false, true); }
+    // .postfix.button { @include button-size(false,false); @include postfix(false, false, true); }
+    // .prefix.button { @include button-size(false,false); @include prefix(false, false, true); }
 
     .prefix.button.radius { @include radius(0); @include side-radius($default-float, $button-radius); }
     .postfix.button.radius { @include radius(0); @include side-radius($opposite-direction, $button-radius); }

diff --git a/vendor/assets/stylesheets/foundation/components/_offcanvas.scss b/vendor/assets/stylesheets/foundation/components/_offcanvas.scss
@@ -3,7 +3,6 @@
 // Licensed under MIT Open Source
 
 @import "global";
-@import "type";
 
 // Off Canvas Tab Bar Variables
 $include-html-off-canvas-classes: $include-html-classes !default;