From 1fb98ef172f0deabfdddf6d64e9bfaeefd9a660d Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Mon, 11 Dec 2017 10:43:45 +0800
Subject: [PATCH] Chore: misc updates

---
 build/bin/build-entry.js                 | 2 --
 build/bin/version.js                     | 2 +-
 examples/docs/zh-CN/table.md             | 2 +-
 examples/versions.json                   | 2 +-
 packages/theme-chalk/src/common/var.scss | 4 ++--
 packages/theme-chalk/src/menu.scss       | 1 +
 packages/theme-chalk/src/table.scss      | 1 +
 src/index.js                             | 2 --
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index fc76b4a43..a5dcbb39c 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -20,8 +20,6 @@ const components = [
 ];
 
 const install = function(Vue, opts = {}) {
-  /* istanbul ignore if */
-  if (install.installed) return;
   locale.use(opts.locale);
   locale.i18n(opts.i18n);
 
diff --git a/build/bin/version.js b/build/bin/version.js
index 54d4fb429..cfea4f294 100644
--- a/build/bin/version.js
+++ b/build/bin/version.js
@@ -1,6 +1,6 @@
 var fs = require('fs');
 var path = require('path');
 var version = process.env.VERSION || require('../../package.json').version;
-var content = { '1.0.9': '1.0', '1.1.6': '1.1', '1.2.9': '1.2', '1.3.7': '1.3', '1.4.11': '1.4' };
+var content = { '1.4.12': '1.4' };
 if (!content[version]) content[version] = '2.0';
 fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));
diff --git a/examples/docs/zh-CN/table.md b/examples/docs/zh-CN/table.md
index 8e08b640c..c1eda7ba4 100644
--- a/examples/docs/zh-CN/table.md
+++ b/examples/docs/zh-CN/table.md
@@ -1777,7 +1777,7 @@
 ### 合并行或列
 
 多行或多列共用一个数据时，可以合并行或列。
-:::demo 通过给`table`传入`span-method`方法可以实现合并行或列，方法的参数是一个对象，里面包含当前行`row`、当前列`column`、当前行号`rowIndex`、当前列号`columnIndex`四个属性。该函数可以返回一个包含两个元素的数组，第一个元素代表`rowspan`，第二个元素代表`colspan`。 也可以返回一个键名为`rowsapn`和`colspan`的对象。
+:::demo 通过给`table`传入`span-method`方法可以实现合并行或列，方法的参数是一个对象，里面包含当前行`row`、当前列`column`、当前行号`rowIndex`、当前列号`columnIndex`四个属性。该函数可以返回一个包含两个元素的数组，第一个元素代表`rowspan`，第二个元素代表`colspan`。 也可以返回一个键名为`rowspan`和`colspan`的对象。
 
 ```html
 <template>
diff --git a/examples/versions.json b/examples/versions.json
index f1a4af808..0160f6ba6 100644
--- a/examples/versions.json
+++ b/examples/versions.json
@@ -1 +1 @@
-{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.11":"1.4","2.0.7":"2.0"}
\ No newline at end of file
+{"1.4.12":"1.4","2.0.7":"2.0"}
\ No newline at end of file
diff --git a/packages/theme-chalk/src/common/var.scss b/packages/theme-chalk/src/common/var.scss
index 7a97480e2..3ae668249 100644
--- a/packages/theme-chalk/src/common/var.scss
+++ b/packages/theme-chalk/src/common/var.scss
@@ -25,8 +25,8 @@ $--color-primary-light-7: mix($--color-white, $--color-primary, 70%) !default; /
 $--color-primary-light-8: mix($--color-white, $--color-primary, 80%) !default; /* d9ecff */
 $--color-primary-light-9: mix($--color-white, $--color-primary, 90%) !default; /* ecf5ff */
 
-$--color-success: #67c23a !default;
-$--color-warning: #eb9e05 !default;
+$--color-success: #5cb87a !default;
+$--color-warning: #e6a23c !default;
 $--color-danger: #fa5555 !default;
 $--color-info: #878d99 !default;
 
diff --git a/packages/theme-chalk/src/menu.scss b/packages/theme-chalk/src/menu.scss
index 5464b1ec1..d31775cef 100644
--- a/packages/theme-chalk/src/menu.scss
+++ b/packages/theme-chalk/src/menu.scss
@@ -171,6 +171,7 @@
     width: 24px;
     text-align: center;
     font-size: 18px;
+    vertical-align: middle;
   }
   & * {
     vertical-align: middle;
diff --git a/packages/theme-chalk/src/table.scss b/packages/theme-chalk/src/table.scss
index cd66400be..7d8966ffb 100644
--- a/packages/theme-chalk/src/table.scss
+++ b/packages/theme-chalk/src/table.scss
@@ -434,6 +434,7 @@
     vertical-align: middle;
     cursor: pointer;
     overflow: initial;
+    position: relative;
   }
 
   .sort-caret {
diff --git a/src/index.js b/src/index.js
index bd52ca1a4..56dd722d2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -142,8 +142,6 @@ const components = [
 ];
 
 const install = function(Vue, opts = {}) {
-  /* istanbul ignore if */
-  if (install.installed) return;
   locale.use(opts.locale);
   locale.i18n(opts.i18n);