Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 1b33a1a

Browse files
EladBezalelThomasBurleson
authored andcommitted
fix(toolbar): transitions applied too soon before css loaded
- Moved the transitions to a class, had to use nextTick to make sure the app was loaded fixes #7986 Closes #8738
1 parent 0b77b0a commit 1b33a1a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/components/toolbar/toolbar.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ function mdToolbarDirective($$rAF, $mdConstant, $mdUtil, $mdTheming, $animate) {
7272
element.addClass('_md'); // private md component indicator for styling
7373
$mdTheming(element);
7474

75+
$mdUtil.nextTick(function () {
76+
element.addClass('_md-toolbar-transitions'); // adding toolbar transitions after digest
77+
}, false);
78+
7579
if (angular.isDefined(attr.mdScrollShrink)) {
7680
setupScrollShrink();
7781
}

src/components/toolbar/toolbar.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ md-toolbar {
3030
min-height: $baseline-grid * 8;
3131
width: 100%;
3232

33-
transition-duration: $swift-ease-in-out-duration;
34-
transition-timing-function: $swift-ease-in-out-timing-function;
35-
transition-property: background-color, fill, color;
33+
&._md-toolbar-transitions {
34+
transition-duration: $swift-ease-in-out-duration;
35+
transition-timing-function: $swift-ease-in-out-timing-function;
36+
transition-property: background-color, fill, color;
37+
}
3638

3739
&.md-whiteframe-z1-add, &.md-whiteframe-z1-remove {
3840
transition: box-shadow $swift-ease-in-out-duration linear;

0 commit comments

Comments
 (0)