From b5c5bef5299c7c58f926b5797acc4722f086dfde Mon Sep 17 00:00:00 2001
From: Ben Biggs <bfletcherbiggs@gmail.com>
Date: Wed, 7 Aug 2019 11:50:17 -0500
Subject: [PATCH] fix(input): change icon padding to 44px

---
 core/scss/components/input/settings.scss | 2 +-
 core/scss/ng/settings/settings.scss      | 6 ++++++
 core/scss/settings/settings.scss         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/scss/components/input/settings.scss b/core/scss/components/input/settings.scss
index d802d305e1..770ff0e440 100644
--- a/core/scss/components/input/settings.scss
+++ b/core/scss/components/input/settings.scss
@@ -34,7 +34,7 @@ $input__border-color--success: $md-green-50 !default;
 $input__font-size: rem-calc(16) !default;
 $input__height: rem-calc(36) !default;
 $input__padding-side: rem-calc(16) !default;
-$input__padding-side--icon: rem-calc(36) !default;
+$input__padding-side--icon: rem-calc(44) !default;
 $input__padding: 0 $input__padding-side;
 >>>>>>> feat(input): rework input architecture
 $input__border-radius: $global-radius;
diff --git a/core/scss/ng/settings/settings.scss b/core/scss/ng/settings/settings.scss
index 7d9aa643ac..ca67f2ddc5 100644
--- a/core/scss/ng/settings/settings.scss
+++ b/core/scss/ng/settings/settings.scss
@@ -7051,6 +7051,7 @@ $input__class--filled: '#{$input__class}--filled';
 
 // Defaults
 $input__height: rem-calc(36) !default;
+<<<<<<< HEAD
 $input__padding-top: rem-calc(9) !default;
 $input__padding-right: rem-calc(16) * 0.75 !default;
 $input__padding-bottom: rem-calc(7) !default;
@@ -7089,6 +7090,11 @@ $input__border-color--read-only: transparent !default;
 $input__border-color--error: $md-red-50 !default;
 $input__border-color--warning: $md-yellow-50 !default;
 $input__border-color--success: $md-green-50 !default;
+=======
+$input__padding-side: rem-calc(16) !default;
+$input__padding-side--icon: rem-calc(44) !default;
+$input__padding: 0 $input__padding-side;
+>>>>>>> fix(input): change icon padding to 44px
 $input__border-radius: $global-radius;
 
 $input__focus-z-index: 800;
diff --git a/core/scss/settings/settings.scss b/core/scss/settings/settings.scss
index 100297de5a..698ce55b9b 100644
--- a/core/scss/settings/settings.scss
+++ b/core/scss/settings/settings.scss
@@ -4209,7 +4209,7 @@ $input__font-family: $brand-font-regular !default;
 $input__font-size: rem-calc(16) !default;
 $input__height: rem-calc(36) !default;
 $input__padding-side: rem-calc(16) !default;
-$input__padding-side--icon: rem-calc(36) !default;
+$input__padding-side--icon: rem-calc(44) !default;
 $input__padding: 0 $input__padding-side;
 $input__border-radius: $global-radius;
 $input--pill__border-radius: $global-rounded;