From f4cf9185836afd15a16ddfcddd26c876a4f5f272 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 5 Dec 2017 10:27:15 -0500 Subject: [PATCH] refactor(sass): move item vars out of input source --- packages/core/src/components/input/input.ios.scss | 4 ++-- packages/core/src/components/input/input.ios.vars.scss | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/core/src/components/input/input.ios.scss b/packages/core/src/components/input/input.ios.scss index bbf52152ac..00a40fd7ea 100644 --- a/packages/core/src/components/input/input.ios.scss +++ b/packages/core/src/components/input/input.ios.scss @@ -108,7 +108,7 @@ .label-ios + ion-input .text-input, .label-ios + ion-textarea .text-input, .label-ios + .input + .cloned-input { - @include margin-horizontal($item-ios-padding-start, null); + @include margin-horizontal($input-ios-by-label-margin-start, null); } // iOS Clear Input Icon @@ -119,7 +119,7 @@ } .input-ios[clear-input] .text-input { - @include padding-horizontal(null, ($input-ios-input-clear-icon-width + $item-ios-padding-end)); + @include padding-horizontal(null, $input-ios-input-clear-padding-end); } .input-ios .text-input-clear-icon { diff --git a/packages/core/src/components/input/input.ios.vars.scss b/packages/core/src/components/input/input.ios.vars.scss index 90f61a2f7c..e98a26e63b 100644 --- a/packages/core/src/components/input/input.ios.vars.scss +++ b/packages/core/src/components/input/input.ios.vars.scss @@ -17,6 +17,9 @@ $input-ios-margin-bottom: $item-ios-padding-bottom !default; /// @prop - Margin start of the input $input-ios-margin-start: 0 !default; +/// @prop - Margin start of the input when it is after a label +$input-ios-by-label-margin-start: $item-ios-padding-start !default; + /// @prop - Padding top of the inset input $input-ios-inset-padding-top: ($item-ios-padding-top / 2) !default; @@ -53,6 +56,9 @@ $input-ios-input-clear-icon-svg: "