From 6a5a3aaa2fb337c8a2793639e791b60c53f92e35 Mon Sep 17 00:00:00 2001
From: maran <ran.ma@ele.me>
Date: Wed, 1 Nov 2017 14:48:23 +0800
Subject: [PATCH]  remove outline for collapse & upload

---
 examples/docs/en-US/upload.md          |  2 +-
 examples/docs/zh-CN/upload.md          |  2 +-
 packages/theme-chalk/src/collapse.scss | 13 +++++++++----
 packages/theme-chalk/src/upload.scss   | 20 ++++++++++++++------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/examples/docs/en-US/upload.md b/examples/docs/en-US/upload.md
index b5d52ec4e..267e889af 100644
--- a/examples/docs/en-US/upload.md
+++ b/examples/docs/en-US/upload.md
@@ -18,7 +18,7 @@
         position: relative;
         overflow: hidden;
 
-        &:hover {
+        &:hover, &:focus {
           border-color: #409EFF;
         }
       }
diff --git a/examples/docs/zh-CN/upload.md b/examples/docs/zh-CN/upload.md
index af97ac2b9..ce8378204 100644
--- a/examples/docs/zh-CN/upload.md
+++ b/examples/docs/zh-CN/upload.md
@@ -18,7 +18,7 @@
         position: relative;
         overflow: hidden;
 
-        &:hover {
+        &:hover, &:focus{
           border-color: #409EFF;
         }
       }
diff --git a/packages/theme-chalk/src/collapse.scss b/packages/theme-chalk/src/collapse.scss
index 4c28cd351..e3fa09055 100644
--- a/packages/theme-chalk/src/collapse.scss
+++ b/packages/theme-chalk/src/collapse.scss
@@ -16,10 +16,7 @@
     font-size: $--collapse-header-size;
     font-weight: 500;
     transition: border-bottom-color .3s;
-    &:focus:not(.focusing), &:active {
-      outline-width: 0;
-    }
-
+    outline: none;
     @include e(arrow) {
       margin-right: 8px;
       transition: transform .3s;
@@ -27,6 +24,14 @@
       line-height: 48px;
       font-weight: 300;
     }
+    &.focusing:focus:not(:hover){
+      color: $--color-primary;
+    }
+
+    //&:focus{
+    //  color: $--color-primary;
+    //}
+
   }
 
   @include e(wrap) {
diff --git a/packages/theme-chalk/src/upload.scss b/packages/theme-chalk/src/upload.scss
index 7e7a67521..d2af72904 100644
--- a/packages/theme-chalk/src/upload.scss
+++ b/packages/theme-chalk/src/upload.scss
@@ -6,7 +6,7 @@
   display: inline-block;
   text-align: center;
   cursor: pointer;
-
+  outline: none;
   @include e(input) {
     display: none;
   }
@@ -48,6 +48,14 @@
       color: $--color-primary;
     }
   }
+  &:focus {
+    border-color: $--color-primary;
+    color: $--color-primary;
+
+    .el-upload-dragger {
+      border-color: $--color-primary;
+    }
+  }
 }
 
 @include b(upload-dragger) {
@@ -160,11 +168,11 @@
       display: none;
       position: absolute;
       top: 5px;
-      right: 0;
+      right: 5px;
+      font-size: 12px;
       cursor: pointer;
       opacity: 1;
       color: $--color-primary;
-      transform: translate(15%,0);
     }
     
     &:hover {
@@ -189,20 +197,20 @@
         cursor: pointer;
       }
 
-      &:focus {
+      &:focus:not(:hover) {  /* 键盘focus */
         .el-icon-close-tip {
           display: inline-block;
         }
       }
 
-      &:focus:not(.focusing), &:active {
+      &:not(.focusing):focus, &:active { /* click时 */
         outline-width: 0;
         .el-icon-close-tip {
           display: none;
         }
       }
 
-      &:hover, &:focus {  /*键盘焦点时 显示提示文字 focus*/
+      &:hover, &:focus {
         .el-upload-list__item-status-label {
           display: none;
         }