Skip to content

Commit

Permalink
fix(input): match up all label transitions
Browse files Browse the repository at this point in the history
- Thx @tjlav5

Fixes angular#6328. Closes angular#6400.
  • Loading branch information
ThomasBurleson authored and ErinCoughlan committed Feb 9, 2016
1 parent b60eefa commit baa8d28
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/components/input/input.scss
Expand Up @@ -115,7 +115,7 @@ md-input-container {
@include rtl(padding-right, 0, $input-container-padding + 1px);
z-index: 1;
transform: translate3d(0, $input-label-default-offset + 4, 0) scale($input-label-default-scale);
transition: transform $swift-ease-out-timing-function 0.25s;
transition: transform $swift-ease-out-duration $swift-ease-out-timing-function;

@include rtl(transform-origin, left top, right top);
}
Expand Down Expand Up @@ -275,8 +275,8 @@ md-input-container {
&.md-input-has-value {
label:not(.md-no-float) {
transform: translate3d(0, $input-label-float-offset, 0) scale($input-label-float-scale);
transition: transform $swift-ease-out-timing-function 0.5s,
width $swift-ease-out-timing-function 0.5s;
transition: transform $swift-ease-out-timing-function $swift-ease-out-duration,
width $swift-ease-out-timing-function $swift-ease-out-duration;
width: calc((100% - #{$input-label-float-width}) / #{$input-label-float-scale});
}
}
Expand Down Expand Up @@ -310,7 +310,7 @@ md-input-container {

&.md-icon-float {

transition: margin-top 0.5s $swift-ease-out-timing-function;
transition: margin-top $swift-ease-out-duration $swift-ease-out-timing-function;

> label {
pointer-events: none;
Expand Down

0 comments on commit baa8d28

Please sign in to comment.