Skip to content

Commit e9ec8ab

Browse files
devversionmmalerba
authored andcommitted
fix(slider): hide ticks when slider is disabled (#2687)
* fix(slider): hide ticks when slider is disabled * No longer shows the ticks on hover, when the slider is disabled. * Address feedback
1 parent 416f56f commit e9ec8ab

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/demo-app/slider/slider-demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h1>Slider with Min and Max</h1>
99
<input [(ngModel)]="max">
1010

1111
<h1>Disabled Slider</h1>
12-
<md-slider disabled [(ngModel)]="disabledValue"></md-slider>
12+
<md-slider disabled [(ngModel)]="disabledValue" [tickInterval]="1"></md-slider>
1313
<input [(ngModel)]="disabledValue">
1414

1515
<h1>Slider with set value</h1>

src/lib/slider/slider.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ md-slider {
7272
transition: opacity $swift-ease-out-duration $swift-ease-out-timing-function;
7373
}
7474

75+
// TODO(mmalerba): Simplify css to avoid unnecessary selectors.
76+
.md-slider-disabled .md-slider-ticks {
77+
opacity: 0;
78+
}
79+
7580
.md-slider-thumb-container {
7681
position: absolute;
7782
z-index: 1;
@@ -127,8 +132,9 @@ md-slider {
127132
}
128133

129134

130-
// Slider with ticks.
135+
// Slider with ticks when not disabled.
131136
.md-slider-has-ticks {
137+
132138
.md-slider-wrapper::after {
133139
content: '';
134140
position: absolute;

src/lib/slider/slider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export class MdSliderChange {
9494
'[class.md-slider-thumb-label-showing]': 'thumbLabel',
9595
'[class.md-slider-vertical]': 'vertical',
9696
'[class.md-slider-min-value]': '_isMinValue',
97-
'[class.md-slider-hide-last-tick]': '_isMinValue && _thumbGap && invertAxis',
97+
'[class.md-slider-hide-last-tick]': '_isMinValue && _thumbGap && invertAxis || disabled',
9898
},
9999
templateUrl: 'slider.html',
100100
styleUrls: ['slider.css'],

0 commit comments

Comments
 (0)