Skip to content

Commit

Permalink
fix(slider): thumb disappearing on disabled element with thumb label (#…
Browse files Browse the repository at this point in the history
…6641)

Fixes the slider thumb becoming hidden when a disabled slider with a thumb label is focused.

Fixes #6631.
  • Loading branch information
crisbeto authored and jelbourn committed Sep 1, 2017
1 parent 11e2239 commit 8243b16
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions src/lib/slider/slider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -214,26 +214,28 @@ $mat-slider-focus-ring-size: 30px !default;


// Active slider.
.cdk-focused {
&.mat-slider-thumb-label-showing .mat-slider-thumb {
transform: scale(0);
}
.mat-slider:not(.mat-slider-disabled) {
&.cdk-focused {
&.mat-slider-thumb-label-showing .mat-slider-thumb {
transform: scale(0);
}

.mat-slider-thumb-label {
border-radius: 50% 50% 0;
}
.mat-slider-thumb-label {
border-radius: 50% 50% 0;
}

.mat-slider-thumb-label-text {
opacity: 1;
.mat-slider-thumb-label-text {
opacity: 1;
}
}
}

.cdk-mouse-focused,
.cdk-touch-focused,
.cdk-program-focused {
.mat-slider-thumb {
border-width: $mat-slider-thumb-border-width-active;
transform: scale($mat-slider-thumb-focus-scale);
&.cdk-mouse-focused,
&.cdk-touch-focused,
&.cdk-program-focused {
.mat-slider-thumb {
border-width: $mat-slider-thumb-border-width-active;
transform: scale($mat-slider-thumb-focus-scale);
}
}
}

Expand Down

0 comments on commit 8243b16

Please sign in to comment.