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

remove outline for collapse & upload

pull/7941/head
maran 2017-11-01 14:48:23 +08:00 committed by 杨奕
parent bd545e4554
commit 6a5a3aaa2f
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docs/en-US/upload.md
View File

@ -18,7 +18,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
&:hover { &:hover, &:focus {
border-color: #409EFF; border-color: #409EFF;
} }
} }

2
examples/docs/zh-CN/upload.md
View File

@ -18,7 +18,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
&:hover { &:hover, &:focus{
border-color: #409EFF; border-color: #409EFF;
} }
} }

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

@ -16,10 +16,7 @@
font-size: $--collapse-header-size; font-size: $--collapse-header-size;
font-weight: 500; font-weight: 500;
transition: border-bottom-color .3s; transition: border-bottom-color .3s;
&:focus:not(.focusing), &:active { outline: none;
outline-width: 0;
}
@include e(arrow) { @include e(arrow) {
margin-right: 8px; margin-right: 8px;
transition: transform .3s; transition: transform .3s;
@ -27,6 +24,14 @@
line-height: 48px; line-height: 48px;
font-weight: 300; font-weight: 300;
} }
&.focusing:focus:not(:hover){
color: $--color-primary;
}
//&:focus{
// color: $--color-primary;
//}
} }
@include e(wrap) { @include e(wrap) {

20
packages/theme-chalk/src/upload.scss
View File

@ -6,7 +6,7 @@
display: inline-block; display: inline-block;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
outline: none;
@include e(input) { @include e(input) {
display: none; display: none;
} }
@ -48,6 +48,14 @@
color: $--color-primary; color: $--color-primary;
} }
} }
&:focus {
border-color: $--color-primary;
color: $--color-primary;
.el-upload-dragger {
border-color: $--color-primary;
}
}
} }
@include b(upload-dragger) { @include b(upload-dragger) {
@ -160,11 +168,11 @@
display: none; display: none;
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 0; right: 5px;
font-size: 12px;
cursor: pointer; cursor: pointer;
opacity: 1; opacity: 1;
color: $--color-primary; color: $--color-primary;
transform: translate(15%,0);
} }
&:hover { &:hover {
@ -189,20 +197,20 @@
cursor: pointer; cursor: pointer;
} }
&:focus { &:focus:not(:hover) { /* 键盘focus */
.el-icon-close-tip { .el-icon-close-tip {
display: inline-block; display: inline-block;
} }
} }
&:focus:not(.focusing), &:active { &:not(.focusing):focus, &:active { /* click时 */
outline-width: 0; outline-width: 0;
.el-icon-close-tip { .el-icon-close-tip {
display: none; display: none;
} }
} }
&:hover, &:focus { /*键盘焦点时 显示提示文字 focus*/ &:hover, &:focus {
.el-upload-list__item-status-label { .el-upload-list__item-status-label {
display: none; display: none;
} }