Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style(progress): added transition to color change #3116

Merged
merged 1 commit into from
Mar 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/lib/progress-bar/progress-bar.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../core/style/variables';

$mat-progress-bar-height: 5px !default;
$mat-progress-bar-full-animation-duration: 2000ms !default;
$mat-progress-bar-piece-animation-duration: 250ms !default;
Expand Down Expand Up @@ -33,7 +35,8 @@ $mat-progress-bar-piece-animation-duration: 250ms !default;
// beyond the current value of the primary progress bar.
.mat-progress-bar-buffer {
transform-origin: top left;
transition: transform $mat-progress-bar-piece-animation-duration ease;
transition: transform $mat-progress-bar-piece-animation-duration ease,
stroke $swift-ease-in-duration $ease-in-out-curve-function;
}

// The secondary progress bar is only used in the indeterminate animation, because of this it
Expand All @@ -46,7 +49,8 @@ $mat-progress-bar-piece-animation-duration: 250ms !default;
.mat-progress-bar-fill {
animation: none;
transform-origin: top left;
transition: transform $mat-progress-bar-piece-animation-duration ease;
transition: transform $mat-progress-bar-piece-animation-duration ease,
stroke $swift-ease-in-duration $ease-in-out-curve-function;
}

// A pseudo element is created for each progress bar bar that fills with the indicator color.
Expand Down
1 change: 1 addition & 0 deletions src/lib/progress-spinner/progress-spinner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ $mat-progress-spinner-viewport-size: 100px !default;

// Stroke width of 10px defines stroke as 10% of the viewBox.
stroke-width: $mat-progress-spinner-stroke-width;
transition: stroke $swift-ease-in-duration $ease-in-out-curve-function;
}


Expand Down