Skip to content

Commit d19a4dd

Browse files
committed
fix(disabled state): Fix style for disabled range slider and ticks
close #394
1 parent 851c8b0 commit d19a4dd

File tree

7 files changed

+73
-8
lines changed

7 files changed

+73
-8
lines changed

demo/demo.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -479,11 +479,14 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
479479

480480
//Disabled slider
481481
$scope.disabled_slider = {
482-
value: 50,
482+
minValue: 20,
483+
maxValue: 80,
483484
options: {
484485
ceil: 100,
485486
floor: 0,
486-
disabled: true
487+
showTicks: 10,
488+
disabled: true,
489+
draggableRange: true
487490
}
488491
};
489492

demo/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ <h2>Vertical sliders</h2>
312312
<h2>Disabled slider</h2>
313313
<label>Disabled <input type="checkbox" ng-model="disabled_slider.options.disabled"></label>
314314
<rzslider
315-
rz-slider-model="disabled_slider.value"
315+
rz-slider-model="disabled_slider.minValue"
316+
rz-slider-high="disabled_slider.maxValue"
316317
rz-slider-options="disabled_slider.options"
317318
></rzslider>
318319
</article>

dist/rzslider.css

+35-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! angularjs-slider - v5.7.0 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2016-10-16 */
4+
2016-10-22 */
55
.rzslider {
66
position: relative;
77
display: inline-block;
@@ -28,6 +28,22 @@
2828
background-color: #d8e0f3;
2929
}
3030

31+
.rzslider[disabled] .rz-bar-wrapper.rz-draggable {
32+
cursor: not-allowed;
33+
}
34+
35+
.rzslider[disabled] .rz-bar.rz-selection {
36+
background: #8b91a2;
37+
}
38+
39+
.rzslider[disabled] .rz-ticks .rz-tick {
40+
cursor: not-allowed;
41+
}
42+
43+
.rzslider[disabled] .rz-ticks .rz-tick.rz-selected {
44+
background: #8b91a2;
45+
}
46+
3147
.rzslider span {
3248
position: absolute;
3349
display: inline-block;
@@ -125,6 +141,14 @@
125141
color: #55637d;
126142
}
127143

144+
.rzslider .rz-bubble.rz-floor {
145+
left: 0;
146+
}
147+
148+
.rzslider .rz-bubble.rz-ceil {
149+
right: 0;
150+
}
151+
128152
.rzslider .rz-ticks {
129153
position: absolute;
130154
top: -3px;
@@ -221,6 +245,16 @@
221245
left: 16px !important;
222246
}
223247

248+
.rzslider.rz-vertical .rz-bubble.rz-floor {
249+
bottom: 0;
250+
left: auto;
251+
}
252+
253+
.rzslider.rz-vertical .rz-bubble.rz-ceil {
254+
top: 0;
255+
right: auto;
256+
}
257+
224258
.rzslider.rz-vertical .rz-ticks {
225259
top: 0;
226260
left: -3px;

dist/rzslider.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rzslider.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rzslider.less

+27-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@
3030
cursor: not-allowed;
3131
background-color: @handleDisabledColor;
3232
}
33+
.rz-bar-wrapper.rz-draggable {
34+
cursor: not-allowed;
35+
}
36+
.rz-bar.rz-selection {
37+
background: @barDisabledFillColor;
38+
}
39+
.rz-ticks .rz-tick {
40+
cursor: not-allowed;
41+
&.rz-selected {
42+
background: @barDisabledFillColor;
43+
}
44+
}
3345
}
3446

3547
span {
@@ -98,7 +110,7 @@
98110
&:hover:after {
99111
background-color: @handleHoverColor;
100112
}
101-
&.rz-active{
113+
&.rz-active {
102114
z-index: 4;
103115
&:after {
104116
background-color: @handleActiveColor;
@@ -117,6 +129,12 @@
117129
&.rz-limit {
118130
color: @limitLabelTextColor;
119131
}
132+
&.rz-floor {
133+
left: 0;
134+
}
135+
&.rz-ceil {
136+
right: 0;
137+
}
120138
}
121139

122140
.rz-ticks {
@@ -210,6 +228,14 @@
210228
left: @handleSize/2 !important;
211229
top: auto;
212230
}
231+
&.rz-floor {
232+
left: auto;
233+
bottom: 0;
234+
}
235+
&.rz-ceil {
236+
right: auto;
237+
top: 0;
238+
}
213239
}
214240

215241
.rz-ticks {

src/variables.less

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@handleDisabledColor: #d8e0f3;
1313
@limitLabelTextColor: @labelTextColor;
1414
@barFillColor: @handleBgColor;
15+
@barDisabledFillColor: #8b91a2;
1516
@barNormalColor: #d8e0f3;
1617

1718
@ticksColor: @barNormalColor;

0 commit comments

Comments
 (0)