Merge remote-tracking branch 'origin/master'

components/pagination/index.jsx

@@ -1,13 +1,14 @@
 'use strict';
 
-let Pagination = require('rc-pagination');
 let React = require('react');
+let Pagination = require('rc-pagination');
+let Select = require('rc-select');
 
 let prefixCls = 'ant-pagination';
 
 class AntPagination extends React.Component {
   render() {
-    return <Pagination selectPrefixCls="ant-select" prefixCls={prefixCls} {...this.props} />;
+    return <Pagination selectComponentClass={Select} selectPrefixCls="ant-select" prefixCls={prefixCls} {...this.props} />;
   }
 }
 

style/components/inputNumber.less

@@ -21,6 +21,10 @@
     line-height: 0;
     height: 15px;
     overflow: hidden;
+    color: #999;
+    &:hover {
+      color: #666;
+    }
   }
 
   &-handler-down {
@@ -30,7 +34,6 @@
   &-handler-up-inner, &-handler-down-inner {
     .iconfont-mixin();
     line-height: 12px;
-    color: #999;
     user-select: none;
     -webkit-user-select: none;
     position: absolute;
@@ -40,9 +43,6 @@
     font-size: ~"8px \9"; // ie8-9
     .scale(0.67);
     right: 4px;
-    &:hover {
-      color: #666;
-    }
   }
 
   &:hover {

style/components/pagination.less

@@ -135,6 +135,11 @@
     }
   }
 
+  &-slash {
+    margin: 0 10px 0 5px;
+  }
+
+
   &-options {
     float: left;
     margin-left: 15px;
@@ -169,10 +174,6 @@
     float: left;
     margin-right: 8px;
 
-    &-slash {
-      margin: 0 10px;
-    }
-
     input {
       margin: 0 8px;
       box-sizing: border-box;

style/components/slider.less

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