Skip to content

I
i20rzslider
Commit d19a4dd1 authored by Valentin Hervieu's avatar Valentin Hervieu
Browse files
Options

fix(disabled state): Fix style for disabled range slider and ticks 

close #394
parent 851c8b0d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 8 deletions
demo/demo.js
View file @ d19a4dd1
...@@ -479,11 +479,14 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) { ...@@ -479,11 +479,14 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
//Disabled slider //Disabled slider
$scope.disabled_slider = { $scope.disabled_slider = {
value: 50, minValue: 20,
maxValue: 80,
options: { options: {
ceil: 100, ceil: 100,
floor: 0, floor: 0,
disabled: true showTicks: 10,
disabled: true,
draggableRange: true
} }
}; };
......
demo/index.html
View file @ d19a4dd1
...@@ -312,7 +312,8 @@ ...@@ -312,7 +312,8 @@
<h2>Disabled slider</h2> <h2>Disabled slider</h2>
<label>Disabled <input type="checkbox" ng-model="disabled_slider.options.disabled"></label> <label>Disabled <input type="checkbox" ng-model="disabled_slider.options.disabled"></label>
<rzslider <rzslider
rz-slider-model="disabled_slider.value" rz-slider-model="disabled_slider.minValue"
rz-slider-high="disabled_slider.maxValue"
rz-slider-options="disabled_slider.options" rz-slider-options="disabled_slider.options"
></rzslider> ></rzslider>
</article> </article>
......
dist/rzslider.css
View file @ d19a4dd1
/*! angularjs-slider - v5.7.0 - /*! angularjs-slider - v5.7.0 -
(c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> -
https://github.com/angular-slider/angularjs-slider - https://github.com/angular-slider/angularjs-slider -
2016-10-16 */ 2016-10-22 */
.rzslider { .rzslider {
position: relative; position: relative;
display: inline-block; display: inline-block;
...@@ -28,6 +28,22 @@ ...@@ -28,6 +28,22 @@
background-color: #d8e0f3; background-color: #d8e0f3;
} }
.rzslider[disabled] .rz-bar-wrapper.rz-draggable {
cursor: not-allowed;
}
.rzslider[disabled] .rz-bar.rz-selection {
background: #8b91a2;
}
.rzslider[disabled] .rz-ticks .rz-tick {
cursor: not-allowed;
}
.rzslider[disabled] .rz-ticks .rz-tick.rz-selected {
background: #8b91a2;
}
.rzslider span { .rzslider span {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
...@@ -125,6 +141,14 @@ ...@@ -125,6 +141,14 @@
color: #55637d; color: #55637d;
} }
.rzslider .rz-bubble.rz-floor {
left: 0;
}
.rzslider .rz-bubble.rz-ceil {
right: 0;
}
.rzslider .rz-ticks { .rzslider .rz-ticks {
position: absolute; position: absolute;
top: -3px; top: -3px;
...@@ -221,6 +245,16 @@ ...@@ -221,6 +245,16 @@
left: 16px !important; left: 16px !important;
} }
.rzslider.rz-vertical .rz-bubble.rz-floor {
bottom: 0;
left: auto;
}
.rzslider.rz-vertical .rz-bubble.rz-ceil {
top: 0;
right: auto;
}
.rzslider.rz-vertical .rz-ticks { .rzslider.rz-vertical .rz-ticks {
top: 0; top: 0;
left: -3px; left: -3px;
......
dist/rzslider.min.css
View file @ d19a4dd1
/*! angularjs-slider - v5.7.0 - (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - https://github.com/angular-slider/angularjs-slider - 2016-10-16 */ /*! angularjs-slider - v5.7.0 - (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - https://github.com/angular-slider/angularjs-slider - 2016-10-22 */
.rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.rzslider.with-legend{margin-bottom:40px}.rzslider[disabled]{cursor:not-allowed}.rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}.rzslider span{position:absolute;display:inline-block;white-space:nowrap}.rzslider .rz-base{width:100%;height:100%;padding:0}.rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}.rzslider .rz-bar-wrapper.rz-draggable{cursor:move}.rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}.rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}.rzslider .rz-pointer:hover:after{background-color:#fff}.rzslider .rz-pointer.rz-active{z-index:4}.rzslider .rz-pointer.rz-active:after{background-color:#451aff}.rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}.rzslider .rz-bubble.rz-selection{top:16px}.rzslider .rz-bubble.rz-limit{color:#55637d}.rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;width:100%;height:0;margin:0;list-style:none;box-sizing:border-box}.rzslider .rz-ticks .rz-tick{position:absolute;top:0;left:0;width:10px;height:10px;margin-left:11px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}.rzslider .rz-ticks .rz-tick.rz-selected{background:#0db9f0}.rzslider .rz-ticks .rz-tick .rz-tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}.rzslider .rz-ticks .rz-tick .rz-tick-legend{position:absolute;top:24px;max-width:50px;white-space:normal;transform:translate(-50%,0)}.rzslider .rz-ticks.rz-ticks-values-under .rz-tick-value{top:initial;bottom:-32px}.rzslider.rz-vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}.rzslider.rz-vertical .rz-base{width:100%;height:100%;padding:0}.rzslider.rz-vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}.rzslider.rz-vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}.rzslider.rz-vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}.rzslider.rz-vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}.rzslider.rz-vertical .rz-bubble.rz-selection{top:auto;left:16px!important}.rzslider.rz-vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%}.rzslider.rz-vertical .rz-ticks .rz-tick{margin-top:11px;margin-left:auto;vertical-align:middle}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value{top:initial;left:24px;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-legend{top:initial;right:24px;max-width:none;white-space:nowrap;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks.rz-ticks-values-under .rz-tick-value{right:24px;bottom:initial;left:initial} .rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.rzslider.with-legend{margin-bottom:40px}.rzslider[disabled]{cursor:not-allowed}.rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}.rzslider[disabled] .rz-bar-wrapper.rz-draggable{cursor:not-allowed}.rzslider[disabled] .rz-bar.rz-selection{background:#8b91a2}.rzslider[disabled] .rz-ticks .rz-tick{cursor:not-allowed}.rzslider[disabled] .rz-ticks .rz-tick.rz-selected{background:#8b91a2}.rzslider span{position:absolute;display:inline-block;white-space:nowrap}.rzslider .rz-base{width:100%;height:100%;padding:0}.rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}.rzslider .rz-bar-wrapper.rz-draggable{cursor:move}.rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}.rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}.rzslider .rz-pointer:hover:after{background-color:#fff}.rzslider .rz-pointer.rz-active{z-index:4}.rzslider .rz-pointer.rz-active:after{background-color:#451aff}.rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}.rzslider .rz-bubble.rz-selection{top:16px}.rzslider .rz-bubble.rz-limit{color:#55637d}.rzslider .rz-bubble.rz-floor{left:0}.rzslider .rz-bubble.rz-ceil{right:0}.rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;width:100%;height:0;margin:0;list-style:none;box-sizing:border-box}.rzslider .rz-ticks .rz-tick{position:absolute;top:0;left:0;width:10px;height:10px;margin-left:11px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}.rzslider .rz-ticks .rz-tick.rz-selected{background:#0db9f0}.rzslider .rz-ticks .rz-tick .rz-tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}.rzslider .rz-ticks .rz-tick .rz-tick-legend{position:absolute;top:24px;max-width:50px;white-space:normal;transform:translate(-50%,0)}.rzslider .rz-ticks.rz-ticks-values-under .rz-tick-value{top:initial;bottom:-32px}.rzslider.rz-vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}.rzslider.rz-vertical .rz-base{width:100%;height:100%;padding:0}.rzslider.rz-vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}.rzslider.rz-vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}.rzslider.rz-vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}.rzslider.rz-vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}.rzslider.rz-vertical .rz-bubble.rz-selection{top:auto;left:16px!important}.rzslider.rz-vertical .rz-bubble.rz-floor{bottom:0;left:auto}.rzslider.rz-vertical .rz-bubble.rz-ceil{top:0;right:auto}.rzslider.rz-vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%}.rzslider.rz-vertical .rz-ticks .rz-tick{margin-top:11px;margin-left:auto;vertical-align:middle}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value{top:initial;left:24px;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-legend{top:initial;right:24px;max-width:none;white-space:nowrap;transform:translate(0,-28%)}.rzslider.rz-vertical .rz-ticks.rz-ticks-values-under .rz-tick-value{right:24px;bottom:initial;left:initial}
\ No newline at end of file \ No newline at end of file
dist/rzslider.min.js
View file @ d19a4dd1
This diff is collapsed.
src/rzslider.less
View file @ d19a4dd1
...@@ -30,6 +30,18 @@ ...@@ -30,6 +30,18 @@
cursor: not-allowed; cursor: not-allowed;
background-color: @handleDisabledColor; background-color: @handleDisabledColor;
} }
.rz-bar-wrapper.rz-draggable {
cursor: not-allowed;
}
.rz-bar.rz-selection {
background: @barDisabledFillColor;
}
.rz-ticks .rz-tick {
cursor: not-allowed;
&.rz-selected {
background: @barDisabledFillColor;
}
}
} }
span { span {
...@@ -98,7 +110,7 @@ ...@@ -98,7 +110,7 @@
&:hover:after { &:hover:after {
background-color: @handleHoverColor; background-color: @handleHoverColor;
} }
&.rz-active{ &.rz-active {
z-index: 4; z-index: 4;
&:after { &:after {
background-color: @handleActiveColor; background-color: @handleActiveColor;
...@@ -117,6 +129,12 @@ ...@@ -117,6 +129,12 @@
&.rz-limit { &.rz-limit {
color: @limitLabelTextColor; color: @limitLabelTextColor;
} }
&.rz-floor {
left: 0;
}
&.rz-ceil {
right: 0;
}
} }
.rz-ticks { .rz-ticks {
...@@ -210,6 +228,14 @@ ...@@ -210,6 +228,14 @@
left: @handleSize/2 !important; left: @handleSize/2 !important;
top: auto; top: auto;
} }
&.rz-floor {
left: auto;
bottom: 0;
}
&.rz-ceil {
right: auto;
top: 0;
}
} }
.rz-ticks { .rz-ticks {
......
src/variables.less
View file @ d19a4dd1
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
@handleDisabledColor: #d8e0f3; @handleDisabledColor: #d8e0f3;
@limitLabelTextColor: @labelTextColor; @limitLabelTextColor: @labelTextColor;
@barFillColor: @handleBgColor; @barFillColor: @handleBgColor;
@barDisabledFillColor: #8b91a2;
@barNormalColor: #d8e0f3; @barNormalColor: #d8e0f3;
@ticksColor: @barNormalColor; @ticksColor: @barNormalColor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment