From 2eaee018e6a5a7b313b66b78f915955fd7b7db0a Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Mon, 17 Feb 2014 17:12:50 -0500 Subject: [PATCH] fixed merge conflict --- scss/foundation/components/_buttons.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.2