Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2015-07-15 15:51:06 +08:00
commit a5c2763571

View File

@ -1,13 +1,13 @@
@sliderClass: ~"@{css-prefix}slider"; @sliderClass: ~"@{css-prefix}slider";
// slider color // slider color
@disabledColor: #ccc; @slider-disabled-color: #ccc;
// tooltip // tooltip
@tooltip-color: #fff; @slider-tooltip-color: #fff;
@tooltip-bg: tint(#666, 4%); @slider-tooltip-bg: tint(#666, 4%);
@tooltip-arrow-width: 4px; @slider-tooltip-arrow-width: 4px;
@tooltip-distance: @tooltip-arrow-width+4; @slider-tooltip-distance: @slider-tooltip-arrow-width+4;
@tooltip-arrow-color: @tooltip-bg; @slider-tooltip-arrow-color: @slider-tooltip-bg;
.@{sliderClass} { .@{sliderClass} {
position: relative; position: relative;
@ -105,11 +105,11 @@
background-color: #e9e9e9; background-color: #e9e9e9;
.@{sliderClass}-track { .@{sliderClass}-track {
background-color: @disabledColor; background-color: @slider-disabled-color;
} }
.@{sliderClass}-handle { .@{sliderClass}-handle {
border-color: @disabledColor; border-color: @slider-disabled-color;
background-color: #fff; background-color: #fff;
cursor: not-allowed; cursor: not-allowed;
} }
@ -132,7 +132,7 @@
} }
&-placement-top { &-placement-top {
padding: @tooltip-arrow-width 0 @tooltip-distance 0; padding: @slider-tooltip-arrow-width 0 @slider-tooltip-distance 0;
} }
&-inner { &-inner {
@ -141,10 +141,10 @@
height: 24px; height: 24px;
font-size: @font-size-base; font-size: @font-size-base;
line-height: 1; line-height: 1;
color: @tooltip-color; color: @slider-tooltip-color;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
background-color: @tooltip-bg; background-color: @slider-tooltip-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
box-shadow: 0 0 4px #d9d9d9; box-shadow: 0 0 4px #d9d9d9;
} }
@ -158,11 +158,11 @@
} }
&-placement-top &-arrow { &-placement-top &-arrow {
bottom: @tooltip-distance - @tooltip-arrow-width; bottom: @slider-tooltip-distance - @slider-tooltip-arrow-width;
left: 50%; left: 50%;
margin-left: -@tooltip-arrow-width; margin-left: -@slider-tooltip-arrow-width;
border-width: @tooltip-arrow-width @tooltip-arrow-width 0; border-width: @slider-tooltip-arrow-width @slider-tooltip-arrow-width 0;
border-top-color: @tooltip-arrow-color; border-top-color: @slider-tooltip-arrow-color;
} }
} }
} }