Merge branch 'master' into components-table

This commit is contained in:
afc163 2015-07-14 16:53:13 +08:00
commit 21ebe2a8bb

View File

@ -1,6 +1,5 @@
@prefixClass: ant-pagination; @prefixClass: ant-pagination;
.@{prefixClass} { .@{prefixClass} {
user-select: none; user-select: none;
font-size: 12px; font-size: 12px;
@ -27,25 +26,26 @@
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
background-color: #fff; background-color: #fff;
margin-right: 8px; margin-right: 8px;
transition: all 0.3s ease;
a { a {
text-decoration: none; text-decoration: none;
color: #666; color: #666;
} }
&:hover { &:hover {
border-color: #2db7f5; border-color: @primary-color;
a { a {
color: #2db7f5; color: @primary-color;
} }
} }
&-active { &-active {
background-color: #2db7f5; background-color: @primary-color;
border: none; border-color: @primary-color;
a { a,
&:hover a {
color: #fff; color: #fff;
} }
} }
@ -63,7 +63,7 @@
&:hover { &:hover {
&:after { &:after {
color: #2db7f5; color: @primary-color;
} }
} }
@ -111,10 +111,10 @@
} }
&:hover { &:hover {
border-color: #2db7f5; border-color: @primary-color;
a { a {
color: #2db7f5; color: @primary-color;
} }
} }
@ -157,8 +157,6 @@
} }
} }
&-simple &-prev, &-simple &-next { &-simple &-prev, &-simple &-next {
border: none; border: none;
height: 24px; height: 24px;
@ -189,7 +187,7 @@
&:hover { &:hover {
border-color: #2db7f5; border-color: @primary-color;
} }
} }