mirror of
https://github.com/ant-design/ant-design.git
synced 2024-11-29 13:47:02 +08:00
Merge branch 'master' of github.com:ant-design/ant-design
This commit is contained in:
commit
9b683d297a
@ -12,7 +12,6 @@
|
||||
"url": "https://github.com/ant-design/ant-design/issues"
|
||||
},
|
||||
"dependencies": {
|
||||
"css-animation": "~1.0.3",
|
||||
"gregorian-calendar": "~3.0.0",
|
||||
"gregorian-calendar-format": "~3.0.1",
|
||||
"rc-calendar": "~3.10.0",
|
||||
@ -27,7 +26,8 @@
|
||||
"rc-tooltip": "~2.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"react-router": "~0.13.3",
|
||||
"css-animation": "~1.0.3",
|
||||
"autoprefixer-loader": "~2.0.0",
|
||||
"babel": "~5.6.14",
|
||||
"babel-core": "~5.4.7",
|
||||
"babel-loader": "~5.1.3",
|
||||
@ -42,6 +42,7 @@
|
||||
"lodash": "^3.10.0",
|
||||
"nico-jsx": "~0.5.8",
|
||||
"precommit-hook": "^1.0.7",
|
||||
"react-router": "~0.13.3",
|
||||
"webpack": "^1.10.1",
|
||||
"webpack-dev-middleware": "^1.2.0"
|
||||
},
|
||||
|
@ -66,9 +66,11 @@
|
||||
border-left: 1px solid #D9D9D9;
|
||||
width: 20px;
|
||||
height: 26px;
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
&-handler-up {
|
||||
padding-top: 1px;
|
||||
border-bottom: 1px solid #D9D9D9;
|
||||
&-inner {
|
||||
.iconfont-mixin();
|
||||
|
@ -40,7 +40,6 @@
|
||||
text-align: center;
|
||||
line-height: 1;
|
||||
top: 50%;
|
||||
-webkit-transform: translateY(-50%);
|
||||
transform: translateY(-50%);
|
||||
left: 0;
|
||||
|
||||
|
@ -5,8 +5,6 @@
|
||||
@wait-color: #e9e9e9;
|
||||
|
||||
.transition(@transition) {
|
||||
-webkit-transition: @transition;
|
||||
-o-transition: @transition;
|
||||
transition: @transition;
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@
|
||||
.button-size(@btn-padding-base; @font-size-base; @btn-border-radius-base);
|
||||
.user-select(none);
|
||||
.transition(all .3s @ease-in-out);
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
|
||||
> .@{iconfont-css-prefix} {
|
||||
font-size: @font-size-base + 2;
|
||||
|
@ -35,13 +35,12 @@ module.exports = {
|
||||
}, {
|
||||
test: /\.less$/,
|
||||
loader: ExtractTextPlugin.extract(
|
||||
'css?sourceMap&-restructuring!' +
|
||||
'less?sourceMap'
|
||||
'css?sourceMap&-restructuring!' + 'autoprefixer-loader?browsers=last 2 versions!' + 'less?sourceMap'
|
||||
)
|
||||
}, {
|
||||
test: /\.css$/,
|
||||
loader: ExtractTextPlugin.extract(
|
||||
'css?sourceMap'
|
||||
'css?sourceMap!' + 'autoprefixer-loader?browsers=last 2 versions'
|
||||
)
|
||||
}]
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user