From abc93bc355328c200a750dfee8c9f2ee50267aec Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Tue, 8 Dec 2015 15:44:11 -0500
Subject: [PATCH] refactor(text-input): renamed some classes and removed some
 nesting

references #689
---
 ionic/components/text-input/label.scss               |  8 ++------
 ionic/components/text-input/modes/ios.scss           |  4 ++--
 ionic/components/text-input/modes/md.scss            | 12 ++++++------
 .../text-input/test/floating-labels/main.html        |  2 +-
 ionic/components/text-input/text-input.scss          |  2 +-
 ionic/components/text-input/text-input.ts            |  4 ++--
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ionic/components/text-input/label.scss b/ionic/components/text-input/label.scss
index a1af3688b3..8df7c0c830 100644
--- a/ionic/components/text-input/label.scss
+++ b/ionic/components/text-input/label.scss
@@ -18,14 +18,10 @@ ion-label {
   max-width: 200px;
 }
 
-ion-input[stacked-label],
-ion-input[floating-label] {
-  flex-direction: column;
-  align-items: flex-start;
-}
-
 [stacked-label],
 [floating-label] {
+  flex-direction: column;
+  align-items: flex-start;
 
   ion-label {
     align-self: stretch;
diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss
index f6ebb8adbb..70c19af48c 100644
--- a/ionic/components/text-input/modes/ios.scss
+++ b/ionic/components/text-input/modes/ios.scss
@@ -48,8 +48,8 @@ ion-label + [text-input] {
   transition: transform 150ms ease-in-out;
 }
 
-[floating-label].has-focus ion-label,
-[floating-label].has-value ion-label  {
+[floating-label].input-focused ion-label,
+[floating-label].input-has-value ion-label  {
   transform: translate3d(0, 0, 0) scale(0.8);
 }
 
diff --git a/ionic/components/text-input/modes/md.scss b/ionic/components/text-input/modes/md.scss
index 23a728c389..6be1140da1 100644
--- a/ionic/components/text-input/modes/md.scss
+++ b/ionic/components/text-input/modes/md.scss
@@ -37,11 +37,11 @@ ion-input:after {
   content: '';
 }
 
-ion-input.has-focus:after {
+.input-focused:after {
   border-bottom: 2px solid $text-input-md-highlight-color;
 }
 
-ion-input.ng-valid.has-value:after {
+ion-input.ng-valid.input-has-value:after {
   border-bottom: 2px solid $text-input-md-hightlight-color-valid;
 }
 
@@ -59,8 +59,8 @@ ion-input.ng-invalid.ng-touched:after {
   margin-left: 0;
 }
 
-[stacked-label].has-focus ion-label,
-[floating-label].has-focus ion-label {
+[stacked-label].input-focused ion-label,
+[floating-label].input-focused ion-label {
   color: $text-input-md-highlight-color;
 }
 
@@ -78,8 +78,8 @@ ion-input.ng-invalid.ng-touched:after {
   transition: transform 150ms ease-in-out;
 }
 
-[floating-label].has-focus ion-label,
-[floating-label].has-value ion-label  {
+[floating-label].input-focused ion-label,
+[floating-label].input-has-value ion-label  {
   transform: translate3d(0, 0, 0) scale(0.8);
 }
 
diff --git a/ionic/components/text-input/test/floating-labels/main.html b/ionic/components/text-input/test/floating-labels/main.html
index 1534d821ee..ca011371cc 100644
--- a/ionic/components/text-input/test/floating-labels/main.html
+++ b/ionic/components/text-input/test/floating-labels/main.html
@@ -11,7 +11,7 @@
       <input type="text">
     </ion-input>
 
-    <ion-input floating-label class="has-value">
+    <ion-input floating-label class="input-has-value">
       <ion-label>Floating Label 2</ion-label>
       <input value="Has Value" type="text">
     </ion-input>
diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss
index 2f3d9cab20..a1b41df532 100644
--- a/ionic/components/text-input/text-input.scss
+++ b/ionic/components/text-input/text-input.scss
@@ -34,7 +34,7 @@ ion-input [text-input] {
   pointer-events: none;
 }
 
-ion-input.has-focus [text-input] {
+.input-focused [text-input] {
   pointer-events: auto;
 }
 
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 785a3bb4d5..cc4d99d84e 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -372,7 +372,7 @@ export class TextInput {
    * @private
    */
   focusChange(hasFocus) {
-    this.renderer.setElementClass(this.elementRef, 'has-focus', hasFocus);
+    this.renderer.setElementClass(this.elementRef, 'input-focused', hasFocus);
     if (!hasFocus) {
       this.deregMove();
       this.input.hideFocus(false);
@@ -383,7 +383,7 @@ export class TextInput {
    * @private
    */
   hasValue(inputValue) {
-    this.renderer.setElementClass(this.elementRef, 'has-value', inputValue && inputValue !== '');
+    this.renderer.setElementClass(this.elementRef, 'input-has-value', inputValue && inputValue !== '');
   }
 
   /**