From: Shawn Erquhart <shawn@professant.com>
Date: Mon, 17 Feb 2014 22:12:50 +0000 (-0500)
Subject: fixed merge conflict
X-Git-Tag: v5.2.1~5^2~12^2~8^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F4469%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

fixed merge conflict
---

diff --git a/scss/foundation/components/_buttons.scss b/scss/foundation/components/_buttons.scss
index 4e35a7f37..d6a5177df 100644
--- a/scss/foundation/components/_buttons.scss
+++ b/scss/foundation/components/_buttons.scss
@@ -130,7 +130,7 @@ $button-disabled-opacity: 0.7 !default;
 // $bg - Primary color set in settings file. Default: $primary-color.
 // $radius - If true, set to button radius which is $global-radius || explicitly set radius amount in px (ex. $radius:10px). Default: false
 // $disabled - We can set $disabled:true to create a disabled transparent button. Default: false
-@mixin button-style($bg:$primary-color, $radius:true, $disabled:false) {
+@mixin button-style($bg:$primary-color, $radius:false, $disabled:false) {
 
   // We control which background styles are used,
   // these can be removed by setting $bg:false
@@ -233,4 +233,4 @@ $button-disabled-opacity: 0.7 !default;
       }
     }
   }
-}
+}
\ No newline at end of file