From f704dda627c2a030e0bdda44f6cb12ac59e951e0 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Sat, 14 Feb 2015 16:14:44 -0600 Subject: [PATCH] fix(input): improve use of placeholder and floating label Closes #1409. --- src/components/icon/iconService.js | 3 ++- src/components/input/demoBasicUsage/index.html | 18 +++++++++++++----- src/components/input/input.scss | 5 +++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/components/icon/iconService.js b/src/components/icon/iconService.js index 3328aebd2a6..036a20ff53a 100644 --- a/src/components/icon/iconService.js +++ b/src/components/icon/iconService.js @@ -315,7 +315,8 @@ } /** - * + * Loads the file as XML and uses querySelector( ) to find + * the desired node... */ function loadFromIconSet(id) { var setName = id.substring(0, id.lastIndexOf(':')) || '$default'; diff --git a/src/components/input/demoBasicUsage/index.html b/src/components/input/demoBasicUsage/index.html index a67154c0f15..0909f1be173 100644 --- a/src/components/input/demoBasicUsage/index.html +++ b/src/components/input/demoBasicUsage/index.html @@ -14,11 +14,18 @@
- - - - - +
+ + + + + + + + + +
+
@@ -55,6 +62,7 @@ + diff --git a/src/components/input/input.scss b/src/components/input/input.scss index f18061a1942..99b21cf6d9f 100644 --- a/src/components/input/input.scss +++ b/src/components/input/input.scss @@ -77,6 +77,11 @@ md-input-container { opacity: 0; } + &:not( .md-input-has-value ) input:not( :focus ) { + color: transparent; + } + + /* * The .md-input class is added to the input/textarea */