test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-02 12:09:14 +08:00
Code Issues Actions 84 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
蔡伦 2015-07-15 16:01:44 +08:00
commit 59b927838a
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/pagination/index.jsx
View File

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

8
style/components/inputNumber.less
View File

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

9
style/components/pagination.less
View File

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

30
style/components/slider.less
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;
} }
} }
} }