From f98b9a7dbe798c318c912cada854b95dcdd462e0 Mon Sep 17 00:00:00 2001
From: Nicolas Coden <nicolas@ncoden.fr>
Date: Tue, 8 Nov 2016 07:21:20 +0100
Subject: [PATCH] Fix button-radius config naming collision

Fix naming collision with `$button-radius` config between Button
component and Form buttons.
---
 scss/forms/_text.scss        | 6 +++---
 scss/settings/_settings.scss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scss/forms/_text.scss b/scss/forms/_text.scss
index b61e01d38..93fd4fb68 100644
--- a/scss/forms/_text.scss
+++ b/scss/forms/_text.scss
@@ -70,9 +70,9 @@ $input-number-spinners: true !default;
 /// @type Border
 $input-radius: $global-radius !default;
 
-/// Border radius for buttons, defaulted to global-radius.
+/// Border radius for form buttons, defaulted to global-radius.
 /// @type Number
-$button-radius: $global-radius !default;
+$form-button-radius: $global-radius !default;
 
 @mixin form-element {
   $height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
@@ -146,7 +146,7 @@ $button-radius: $global-radius !default;
   // Reset styles on button-like inputs
   [type='submit'],
   [type='button'] {
-    border-radius: $button-radius;
+    border-radius: $form-button-radius;
     -webkit-appearance: none;
     -moz-appearance: none;
   }
diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index 2f56568dd..3bef3bf0a 100644
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -365,7 +365,7 @@ $input-cursor-disabled: not-allowed;
 $input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out;
 $input-number-spinners: true;
 $input-radius: $global-radius;
-$button-radius: $global-radius;
+$form-button-radius: $global-radius;
 
 // 19. Label
 // ---------
-- 
2.47.2