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

Collapse: slot header use display flex instead of float (#13277) (#13290)

pull/13319/head
Harlan 2018-11-06 17:39:33 +08:00 committed by hetech
parent 9a31f5f6e6
commit 717b3480b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/collapse/src/collapse-item.vue
View File

@ -20,11 +20,11 @@
@focus="handleFocus" @focus="handleFocus"
@blur="focusing = false" @blur="focusing = false"
> >
<slot name="title">{{title}}</slot>
<i <i
class="el-collapse-item__arrow el-icon-arrow-right" class="el-collapse-item__arrow el-icon-arrow-right"
:class="{'is-active': isActive}"> :class="{'is-active': isActive}">
</i> </i>
<slot name="title">{{title}}</slot>
</div> </div>
</div> </div>
<el-collapse-transition> <el-collapse-transition>

6
packages/theme-chalk/src/collapse.scss
View File

@ -8,6 +8,8 @@
} }
@include b(collapse-item) { @include b(collapse-item) {
@include e(header) { @include e(header) {
display: flex;
align-items: center;
height: $--collapse-header-height; height: $--collapse-header-height;
line-height: $--collapse-header-height; line-height: $--collapse-header-height;
background-color: $--collapse-header-fill; background-color: $--collapse-header-fill;
@ -19,10 +21,8 @@
transition: border-bottom-color .3s; transition: border-bottom-color .3s;
outline: none; outline: none;
@include e(arrow) { @include e(arrow) {
margin-right: 8px; margin: 0 8px 0 auto;
transition: transform .3s; transition: transform .3s;
float: right;
line-height: 48px;
font-weight: 300; font-weight: 300;
@include when(active) { @include when(active) {
transform: rotate(90deg); transform: rotate(90deg);