From 77b0e6e4b37b3525472bc3909d3347bbd7878312 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Wed, 7 Aug 2019 14:52:24 +0800
Subject: [PATCH] fix: some icon releated style and move button margin

---
 README.md          |  4 ++--
 demo/readme.js     |  4 ++--
 index.js           |  2 ++
 styles/Badge.scss  | 11 +++++------
 styles/Button.scss |  1 -
 styles/Icon.scss   |  2 +-
 styles/Input.scss  |  1 +
 styles/index.scss  |  1 +
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 0c8b13eba..aa4c86b26 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,8 @@ Vue.use(naiveUi)
 |Radio|😍|||
 |Tab|🚧|||
 |Breadcrumb|🚧|||
-|Badge|🚧|||
-|Steps|🚧|||
+|Badge|😍|||
+|Steps|😍|||
 |Tag|🚧|||
 |Divider|🚧|||
 |Statistic|🚧|||
diff --git a/demo/readme.js b/demo/readme.js
index b17a55f42..0ff226511 100644
--- a/demo/readme.js
+++ b/demo/readme.js
@@ -190,13 +190,13 @@ Vue.use(naiveUi)
 </tr>
 <tr>
 <td>Badge</td>
-<td style="text-align:center;">🚧</td>
+<td style="text-align:center;">😍</td>
 <td style="text-align:center;"></td>
 <td></td>
 </tr>
 <tr>
 <td>Steps</td>
-<td style="text-align:center;">🚧</td>
+<td style="text-align:center;">😍</td>
 <td style="text-align:center;"></td>
 <td></td>
 </tr>
diff --git a/index.js b/index.js
index 865ce565a..4e0399f2d 100644
--- a/index.js
+++ b/index.js
@@ -39,6 +39,7 @@ import Scrollbar from './packages/common/Scrollbar'
 import Steps from './packages/common/Steps'
 import Confirm from './packages/common/Confirm'
 import Badge from './packages/common/Badge'
+import Tag from './packages/common/Tag'
 
 function install (Vue) {
   Card.install(Vue)
@@ -82,6 +83,7 @@ function install (Vue) {
   Confirm.install(Vue)
   Progress.install(Vue)
   Badge.install(Vue)
+  Tag.install(Vue)
 }
 
 export default {
diff --git a/styles/Badge.scss b/styles/Badge.scss
index a164a0b9f..821b3ac62 100644
--- a/styles/Badge.scss
+++ b/styles/Badge.scss
@@ -17,23 +17,22 @@
   }
   &.n-badge--success-type {
     .n-badge-sup {
-      color: rgba(75, 81, 106, 1);
-      background-color: rgba(99, 226, 183, 1);
+      background-color: rgba(9, 133, 91, 1);
     }
   }
   &.n-badge--info-type {
     .n-badge-sup {
-      background-color: rgba(98, 187, 252, 1);
+      background-color: rgba(56, 137, 197, 1);
     }
   }
   &.n-badge--warning-type {
     .n-badge-sup {
-      background-color: rgba(255, 138, 0, 1);
+      background-color: rgba(216, 94, 0, 1);
     }
   }
   &.n-badge--error-type {
     .n-badge-sup {
-      background-color: rgba(255, 146, 164, 1);
+      background-color: rgba(210, 82, 129, 1);
     }
   }
 }
@@ -44,7 +43,7 @@
   height: 18px;
   line-height: 18px;
   border-radius: 9px;
-  background-color: rgba(237, 73, 99, 1);
+  background-color: rgba(186, 45, 67, 1);
   padding: 0 6px;
   text-align: center;
   font-size: 12px;
diff --git a/styles/Button.scss b/styles/Button.scss
index 6628e1606..72863eab2 100644
--- a/styles/Button.scss
+++ b/styles/Button.scss
@@ -9,7 +9,6 @@
   cursor: pointer;
   user-select: none;
   font-weight: 700;
-  margin: $button-margin;
   text-align: center;
   .n-button__icon {
     margin-right: 2px;
diff --git a/styles/Icon.scss b/styles/Icon.scss
index 9bda5eaa1..d81c8bec0 100644
--- a/styles/Icon.scss
+++ b/styles/Icon.scss
@@ -7,7 +7,7 @@
   text-align: center;
   display: inline-block;
   position: relative;
-  vertical-align: middle;
+  vertical-align: bottom;
   &::before {
     line-height: 1em;
     width: 1em;
diff --git a/styles/Input.scss b/styles/Input.scss
index 68bbcebd6..4d31b13b3 100644
--- a/styles/Input.scss
+++ b/styles/Input.scss
@@ -18,6 +18,7 @@
   }
   .n-input__icon {
     position: absolute;
+    line-height: 18px;
     height: 18px;
     width: 18px;
     i {
diff --git a/styles/index.scss b/styles/index.scss
index 59fb45c39..1fed7c949 100644
--- a/styles/index.scss
+++ b/styles/index.scss
@@ -29,6 +29,7 @@
 @import './Steps.scss';
 @import './Progress.scss';
 @import './Badge.scss';
+@import './Tag.scss';
 
 @import "./NimbusServiceLayout.scss";
 @import "./Popover.scss";