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

This commit is contained in:
yiminghe 2015-06-10 22:03:37 +08:00
commit 56ce321e39
3 changed files with 22 additions and 14 deletions

View File

@ -485,9 +485,9 @@ ul.anticons-list {
}
ul.anticons-list li {
float: left;
margin: 5px 10px 5px 0;
margin: 5px 5px 5px 0;
padding-bottom: 10px;
width: 154px;
width: 155px;
text-align: center;
list-style: none;
cursor: pointer;

View File

@ -106,6 +106,13 @@ a:hover {
display: none;
}
::selection {
background: rgba(0, 171, 234, 0.42); /* WebKit/Blink Browsers */
}
::-moz-selection {
background: rgba(0, 171, 234, 0.42); /* Gecko Browsers */
}
header {
width: 100%;
background: #fff;

View File

@ -4,14 +4,13 @@
width: 253px;
border: 1px solid #ccc;
list-style: none;
font-size: 12px;
font-size: @font-size-base;
text-align: left;
background-color: #fff;
border-radius: 3px;
box-shadow: 0 1px 5px #ccc;
border-radius: @border-radius-base;
box-shadow: 0 0 4px #d9d9d9;
background-clip: padding-box;
border: 1px solid #ccc;
line-height: 1.5;
line-height: @line-height-base;
&-week-number {
width: 286px;
@ -24,11 +23,11 @@
&-header {
padding: 0 10px;
height: 34px;
line-height: 30px;
line-height: 24px;
text-align: center;
user-select: none;
-webkit-user-select: none;
border-bottom: 1px solid #ccc;
border-bottom: 1px solid #e9e9e9;
> a {
font-weight: bold;
@ -36,6 +35,7 @@
padding: 4px 5px;
text-align: center;
width: 30px;
color: #666;
&:hover {
cursor: pointer;
@ -173,19 +173,20 @@
}
&-footer {
padding: 3px 0;
padding: 0 15px;
height: 42px;
line-height: 42px;
border-top: 1px solid #e9e9e9;
text-align: center;
}
&-footer-btn {
margin-top: 2px;
&-footer > div {
display: inline-block;
}
.@{prefixCalendarClass}-today-btn, .@{prefixCalendarClass}-clear-btn {
display: inline-block;
padding: 4px 5px;
text-align: center;
color: #f46830;
&:hover {
cursor: pointer;