From 662e843a47bfc93a03a14eeab8c972b16360a96b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 4 Sep 2015 09:54:55 -0500
Subject: [PATCH] label colors

---
 ionic/components.ts                              | 2 +-
 ionic/components/{form => text-input}/label.scss | 9 +--------
 ionic/components/{form => text-input}/label.ts   | 0
 ionic/components/text-input/modes/ios.scss       | 3 +++
 ionic/components/text-input/modes/material.scss  | 8 ++++++--
 ionic/components/text-input/text-input.ts        | 2 +-
 ionic/ionic.core.scss                            | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename ionic/components/{form => text-input}/label.scss (74%)
 rename ionic/components/{form => text-input}/label.ts (100%)

diff --git a/ionic/components.ts b/ionic/components.ts
index 7d0e81d1d7..28bf14c052 100644
--- a/ionic/components.ts
+++ b/ionic/components.ts
@@ -13,7 +13,7 @@ export * from 'ionic/components/item/item'
 export * from 'ionic/components/item/item-group'
 export * from 'ionic/components/form/input'
 export * from 'ionic/components/text-input/text-input'
-export * from 'ionic/components/form/label'
+export * from 'ionic/components/text-input/label'
 export * from 'ionic/components/list/list'
 export * from 'ionic/components/show-hide-when/show-hide-when'
 
diff --git a/ionic/components/form/label.scss b/ionic/components/text-input/label.scss
similarity index 74%
rename from ionic/components/form/label.scss
rename to ionic/components/text-input/label.scss
index cd19b766b7..039f1b2cef 100644
--- a/ionic/components/form/label.scss
+++ b/ionic/components/text-input/label.scss
@@ -2,25 +2,18 @@
 // Label
 // --------------------------------------------------
 
-$input-label-color:         #888 !default;
-
 
 ion-label {
   display: block;
   max-width: 200px;
-  color: $input-label-color;
   font-size: inherit;
   white-space: nowrap;
 }
 
 [fixed-label] ion-label {
-  display: block;
-  max-width: 200px;
   width: 30%;
   min-width: 100px;
-  color: $input-label-color;
-  font-size: inherit;
-  white-space: nowrap;
+  max-width: 200px;
 }
 
 ion-input[stacked-label] {
diff --git a/ionic/components/form/label.ts b/ionic/components/text-input/label.ts
similarity index 100%
rename from ionic/components/form/label.ts
rename to ionic/components/text-input/label.ts
diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss
index 9ed39d0300..7a84529fed 100644
--- a/ionic/components/text-input/modes/ios.scss
+++ b/ionic/components/text-input/modes/ios.scss
@@ -2,6 +2,8 @@
 // iOS Text Input
 // --------------------------------------------------
 
+$input-label-ios-color:         #7f7f7f !default;
+
 
 .list[mode=ios],
 ion-card[mode=ios] {
@@ -18,6 +20,7 @@ ion-card[mode=ios] {
 
   ion-label {
     margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2);
+    color: $input-label-ios-color;
   }
 
 }
diff --git a/ionic/components/text-input/modes/material.scss b/ionic/components/text-input/modes/material.scss
index 6d8509b432..a49ee1cdea 100644
--- a/ionic/components/text-input/modes/material.scss
+++ b/ionic/components/text-input/modes/material.scss
@@ -2,6 +2,9 @@
 // Material Design Text Input
 // --------------------------------------------------
 
+$text-input-highlight-color:      map-get($colors, primary) !default;
+$input-label-md-color:            #999 !default;
+
 
 .list[mode=md],
 ion-card[mode=md] {
@@ -18,14 +21,15 @@ ion-card[mode=md] {
 
   ion-label {
     margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2);
+    color: $input-label-md-color;
   }
 
   ion-input.has-focus:after {
-    border-top: 2px solid blue;
+    border-top: 2px solid $text-input-highlight-color;
   }
 
   ion-input.has-focus + ion-input:before {
-    border-top-color: blue;
+    border-top-color: $text-input-highlight-color;
   }
 
 }
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 6b4b8d6b48..ce236fe5bc 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -3,7 +3,7 @@ import {Directive, View, Host, Optional, ElementRef, Attribute, Query, QueryList
 import {IonicDirective} from '../../config/annotations';
 import {IonicConfig} from '../../config/config';
 import {IonInput} from '../form/input';
-import {Label} from '../form/label';
+import {Label} from './label';
 import {Ion} from '../ion';
 import {IonicApp} from '../app/app';
 import {Content} from '../content/content';
diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss
index 789a6acbe1..2fea3ed4ed 100644
--- a/ionic/ionic.core.scss
+++ b/ionic/ionic.core.scss
@@ -25,9 +25,9 @@
   "components/icon/icon",
   "components/item/item",
   "components/form/form",
-  "components/form/label",
   "components/grid/grid",
   "components/text-input/text-input",
+  "components/text-input/label",
   "components/list/list",
   "components/card/card",
   "components/modal/modal",