github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Tabs: fix invalid type prop when tabs in other tabs (#2212)

pull/2225/head
kingwl 2017-01-05 15:22:46 +08:00 committed by cinwell.li
parent 3574e62cb6
commit de589eb215
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/theme-default/src/tabs.css
View File

@ -67,10 +67,10 @@
position: relative; position: relative;
} }
@m card { @m card {
.el-tabs__active-bar { &>.el-tabs__header>.el-tabs__active-bar {
display: none; display: none;
} }
& .el-tabs__item .el-icon-close { &>.el-tabs__header>.el-tabs__item .el-icon-close {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
width: 0; width: 0;
@ -82,7 +82,7 @@
right: -2px; right: -2px;
transform-origin: 100% 50%; transform-origin: 100% 50%;
} }
.el-tabs__item { &>.el-tabs__header>.el-tabs__item {
border: 1px solid transparent; border: 1px solid transparent;
transition: all .3s cubic-bezier(.645,.045,.355,1); transition: all .3s cubic-bezier(.645,.045,.355,1);
@ -115,14 +115,14 @@
border: 1px solid #d3dce6; border: 1px solid #d3dce6;
box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.12), 0px 0px 6px 0px rgba(0,0,0,0.04); box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.12), 0px 0px 6px 0px rgba(0,0,0,0.04);
.el-tabs__content { &>.el-tabs__content {
padding: 15px; padding: 15px;
} }
.el-tabs__header { &>.el-tabs__header {
background-color: #eff2f7; background-color: #eff2f7;
margin: 0; margin: 0;
} }
.el-tabs__item { &>.el-tabs__header>.el-tabs__item {
transition: all .3s cubic-bezier(.645,.045,.355,1); transition: all .3s cubic-bezier(.645,.045,.355,1);
border: 1px solid transparent; border: 1px solid transparent;
border-top: 0; border-top: 0;
@ -140,7 +140,6 @@
border-right-color: #d3dce6; border-right-color: #d3dce6;
} }
} }
} }
} }
} }