From b88b744f325c79db728df83652db08865ac29b7d Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 10 Apr 2015 19:14:00 -0500 Subject: [PATCH] fix(input): float labels support dir=rtl Closes #964. --- src/components/input/input.scss | 5 ++++- src/core/style/mixins.scss | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/input/input.scss b/src/components/input/input.scss index 32a2e77741f..cc46a1ee88a 100644 --- a/src/components/input/input.scss +++ b/src/components/input/input.scss @@ -62,6 +62,7 @@ md-input-container { -ms-flex-preferred-size: auto; //IE fix } + label:not(.md-no-float), .md-placeholder:not(.md-select-label) { order: 1; @@ -70,8 +71,9 @@ md-input-container { padding-left: $input-container-padding; z-index: 1; transform: translate3d(0, $input-label-default-offset, 0) scale($input-label-default-scale); - transform-origin: left top; transition: transform $swift-ease-out-timing-function 0.25s; + + @include bidi-style(transform-origin, left top, transform-origin, right top); } .md-placeholder:not(.md-select-label) { position: absolute; @@ -184,6 +186,7 @@ md-input-container { } } + @media screen and (-ms-high-contrast: active) { md-input-container.md-default-theme > md-icon { fill: #fff; diff --git a/src/core/style/mixins.scss b/src/core/style/mixins.scss index 8c12e1c9067..2bdd0dc1347 100644 --- a/src/core/style/mixins.scss +++ b/src/core/style/mixins.scss @@ -40,3 +40,14 @@ } @return $map-str + '}'; } + + +/* mixin definition ; sets LTR and RTL within the same style call */ +@mixin bidi-style($prop, $value, $inverse-prop, $default-value) { + #{$prop}: $value; + + html[dir=rtl] & { + #{$inverse-prop}: $value; + #{$prop}: $default-value; + } +}