From 32f24f0b19786e2ded53fbb09809d2c6aadb6955 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 8 Dec 2015 16:00:07 -0500 Subject: [PATCH] refactor(text-input): changed text-input references to item-input cleaned up main text-input Sass file references #689 --- ionic/components/text-input/label.scss | 2 +- ionic/components/text-input/modes/ios.scss | 10 ++-- ionic/components/text-input/modes/md.scss | 8 +-- ionic/components/text-input/text-input.scss | 60 +++++++++------------ 4 files changed, 34 insertions(+), 46 deletions(-) diff --git a/ionic/components/text-input/label.scss b/ionic/components/text-input/label.scss index 8df7c0c830..d5987a5955 100644 --- a/ionic/components/text-input/label.scss +++ b/ionic/components/text-input/label.scss @@ -29,7 +29,7 @@ ion-label { max-width: 100%; } - [text-input] { + .item-input { align-self: stretch; width: auto; } diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss index 70c19af48c..12be1c2d35 100644 --- a/ionic/components/text-input/modes/ios.scss +++ b/ionic/components/text-input/modes/ios.scss @@ -9,13 +9,13 @@ $text-input-ios-background-color: $list-ios-background-color !default; $text-input-ios-label-color: #7f7f7f !default; -[text-input] { +.item-input { margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0; padding: 0; background-color: $text-input-ios-background-color; } -ion-input[inset] [text-input] { +ion-input[inset] .item-input { margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) $item-ios-padding-left; padding: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2); } @@ -25,7 +25,7 @@ ion-label { color: $text-input-ios-label-color; } -ion-label + [text-input] { +ion-label + .item-input { margin-left: $item-ios-padding-left; } @@ -34,8 +34,8 @@ ion-label + [text-input] { margin-bottom: 4px; } -[stacked-label] [text-input], -[floating-label] [text-input] { +[stacked-label] .item-input, +[floating-label] .item-input { margin-left: 0; margin-top: 8px; margin-bottom: 8px; diff --git a/ionic/components/text-input/modes/md.scss b/ionic/components/text-input/modes/md.scss index 6be1140da1..a371cdcd88 100644 --- a/ionic/components/text-input/modes/md.scss +++ b/ionic/components/text-input/modes/md.scss @@ -12,13 +12,13 @@ $text-input-md-hightlight-color-valid: map-get($colors-md, secondary) !defa $text-input-md-hightlight-color-invalid: map-get($colors-md, danger) !default; -[text-input] { +.item-input { margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2); padding: 0; background-color: $text-input-md-background-color; } -ion-input[inset] [text-input] { +ion-input[inset] .item-input { margin: ($item-md-padding-top / 2) $item-md-padding-right ($item-md-padding-bottom / 2) $item-md-padding-left; padding: ($item-md-padding-top / 2) ($item-md-padding-right / 2) ($item-md-padding-bottom / 2) ($item-md-padding-left / 2); } @@ -64,8 +64,8 @@ ion-input.ng-invalid.ng-touched:after { color: $text-input-md-highlight-color; } -[stacked-label] [text-input], -[floating-label] [text-input] { +[stacked-label] .item-input, +[floating-label] .item-input { margin-bottom: 8px; margin-top: 8px; margin-left: 0; diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss index a1b41df532..4eba474f0e 100644 --- a/ionic/components/text-input/text-input.scss +++ b/ionic/components/text-input/text-input.scss @@ -3,57 +3,45 @@ // Text Input // -------------------------------------------------- +$text-input-textarea-resize: none !default; -ion-input { - // text inputs - textarea, - input[type="text"], - input[type="password"], - input[type="datetime"], - input[type="datetime-local"], - input[type="date"], - input[type="month"], - input[type="time"], - input[type="week"], - input[type="number"], - input[type="email"], - input[type="url"], - input[type="search"], - input[type="tel"], - input[type="color"] { - display: block; - background: transparent; - border: 0; - width: 100%; - } -} +// All Inputs in ion-input +// -------------------------------------------------- -ion-input [text-input] { +.item-input { + display: block; + background: transparent; + border: 0; flex: 1; pointer-events: none; } -.input-focused [text-input] { - pointer-events: auto; -} -ion-input input[scroll-assist] { - display: inline-block; - padding: 0; - margin: 0; +// Scroll Assist +// -------------------------------------------------- + +[scroll-assist] { width: 1px; height: 1px; + background: transparent; + border: 0; pointer-events: none; } -ion-input textarea { - padding-top: 9px; + +// Input focused +// -------------------------------------------------- + +.input-focused .item-input { + pointer-events: auto; } + +// Input textarea +// -------------------------------------------------- + textarea { - margin: 0; - padding: 0; height: auto; overflow: auto; font: inherit; @@ -61,7 +49,7 @@ textarea { } .platform-mobile textarea { - resize: none; + resize: $text-input-textarea-resize; } input,