From f8b642f8aa17792404e14b0858d9296470e6e6c1 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 20 Nov 2017 17:36:55 +0800
Subject: [PATCH] [improvement] Icon spinner color inherit (#331)

* fix: Tabbar icon line-height

* [new feature] progress add showPivot prop

* [new feature] TabItem support vue-router

* [new feature] update document header style

* [Doc] add toast english ducoment

* [bugfix] Search box-sizing wrong

* [Doc] update vant-demo respo

* [Doc] translate theme & demo pages

* [Doc] add Internationalization document

* [bugfix] remove unnecessary props

* [fix] optimize clickoutside

* [new feature] optimize find-parent

* [new feature]: change document title accordinng to language

* [new feature] Pagination code review

* [improvement] adjust icon-font unicode

* [improvement] Icon spinner color inherit

* [improvement] icon default width
---
 packages/vant-css/scripts/icon-template.css | 1 +
 packages/vant-css/src/icon.css              | 1 +
 packages/vant-css/src/loading.css           | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/vant-css/scripts/icon-template.css b/packages/vant-css/scripts/icon-template.css
index 80008e269..0bc5d715d 100644
--- a/packages/vant-css/scripts/icon-template.css
+++ b/packages/vant-css/scripts/icon-template.css
@@ -6,6 +6,7 @@
 }
 
 .van-icon {
+  width: 1em;
   display: inline-block;
   font: normal normal normal 14px/1 "<%= fontName %>";
   font-size: inherit;
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index 355298e90..cd627cf09 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -6,6 +6,7 @@
 }
 
 .van-icon {
+  width: 1em;
   display: inline-block;
   font: normal normal normal 14px/1 "vant-icon";
   font-size: inherit;
diff --git a/packages/vant-css/src/loading.css b/packages/vant-css/src/loading.css
index 737b785b1..330c3b478 100644
--- a/packages/vant-css/src/loading.css
+++ b/packages/vant-css/src/loading.css
@@ -60,6 +60,7 @@
     }
 
     &--spinner {
+      color: $gray;
       animation-timing-function: steps(12);
 
       i {
@@ -76,14 +77,12 @@
           display: block;
           margin: 0 auto;
           border-radius: 40%;
-          background-color: $gray;
+          background-color: currentColor;
         }
       }
 
       &.van-loading__spinner--white {
-        i::before {
-          background-color: #fff;
-        }
+        color: #fff;
       }
     }
   }