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

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

Browse Source
This commit is contained in:
afc163 2016-03-15 15:18:02 +08:00
commit ceb978e52e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -59,7 +59,7 @@
"rc-steps": "~1.4.1", "rc-steps": "~1.4.1",
"rc-switch": "~1.3.2", "rc-switch": "~1.3.2",
"rc-table": "~3.11.1", "rc-table": "~3.11.1",
"rc-tabs": "~5.7.0", "rc-tabs": "~5.8.0",
"rc-time-picker": "~1.1.0", "rc-time-picker": "~1.1.0",
"rc-tooltip": "~3.3.1", "rc-tooltip": "~3.3.1",
"rc-tree": "~1.1.0", "rc-tree": "~1.1.0",

15
style/components/tabs.less
View File

@ -3,13 +3,16 @@
@effect-duration: .3s; @effect-duration: .3s;
.@{tab-prefix-cls} { .@{tab-prefix-cls} {
outline: none;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
.clearfix; .clearfix;
color: @text-color; color: @text-color;
&-bar {
outline: none;
}
&-ink-bar { &-ink-bar {
z-index: 1; z-index: 1;
position: absolute; position: absolute;
@ -32,7 +35,7 @@
} }
} }
&-tabs-bar { &-bar {
border-bottom: 1px solid @border-color-base; border-bottom: 1px solid @border-color-base;
margin-bottom: 16px; margin-bottom: 16px;
} }
@ -292,7 +295,7 @@
width: auto; width: auto;
} }
.@{tab-prefix-cls}-tabs-bar { .@{tab-prefix-cls}-bar {
border-bottom: 0; border-bottom: 0;
} }
@ -329,7 +332,7 @@
} }
&-vertical&-left { &-vertical&-left {
.@{tab-prefix-cls}-tabs-bar { .@{tab-prefix-cls}-bar {
float: left; float: left;
border-right: 1px solid @border-color-split; border-right: 1px solid @border-color-split;
margin-right: -1px; margin-right: -1px;
@ -356,7 +359,7 @@
} }
&-vertical&-right { &-vertical&-right {
.@{tab-prefix-cls}-tabs-bar { .@{tab-prefix-cls}-bar {
float: right; float: right;
border-left: 1px solid @border-color-split; border-left: 1px solid @border-color-split;
margin-left: -1px; margin-left: -1px;
@ -377,7 +380,7 @@
} }
} }
&-bottom &-tabs-bar { &-bottom &-bar {
margin-bottom: 0; margin-bottom: 0;
margin-top: 16px; margin-top: 16px;
} }