From 333d7f853b8baa510eab3cc6d24ad6e17144237f Mon Sep 17 00:00:00 2001
From: other <other@mewmew.cn>
Date: Wed, 29 Jan 2020 15:55:24 +0800
Subject: [PATCH] update mew-iview

---
 bot/default.js                       | 7 ++++++-
 config/build-style.js                | 4 ++--
 config/webpack.dist.dev.config.js    | 4 ++--
 config/webpack.dist.locale.config.js | 4 ++--
 config/webpack.dist.prod.config.js   | 4 ++--
 src/styles/custom.less               | 6 +++++-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/bot/default.js b/bot/default.js
index b598bb3..d78bef5 100644
--- a/bot/default.js
+++ b/bot/default.js
@@ -4,5 +4,10 @@ module.exports={
     "build": [
         ["npm","install"],
         ["npm","run","dist"]
-    ]
+    ],
+    "dists" : {
+        "types" : "types",
+        "dist"  : "build",
+        "src"   : "src"
+    }
 }
\ No newline at end of file
diff --git a/config/build-style.js b/config/build-style.js
index dde8d1c..dbc2806 100644
--- a/config/build-style.js
+++ b/config/build-style.js
@@ -13,13 +13,13 @@ gulp.task('css', function () {
         }))
         .pipe(cleanCSS())
         .pipe(rename('iview.css'))
-        .pipe(gulp.dest('../dist/styles'));
+        .pipe(gulp.dest('../build/styles'));
 });
 
 // 拷贝字体文件
 gulp.task('fonts', function () {
     gulp.src('../src/styles/common/iconfont/fonts/*.*')
-        .pipe(gulp.dest('../dist/styles/fonts'));
+        .pipe(gulp.dest('../build/styles/fonts'));
 });
 
 gulp.task('default', ['css', 'fonts']);
diff --git a/config/webpack.dist.dev.config.js b/config/webpack.dist.dev.config.js
index 5b060e7..0ee883f 100644
--- a/config/webpack.dist.dev.config.js
+++ b/config/webpack.dist.dev.config.js
@@ -12,8 +12,8 @@ module.exports = merge(webpackBaseConfig, {
         main: './src/index.js'
     },
     output: {
-        path: path.resolve(__dirname, '../dist'),
-        publicPath: '/dist/',
+        path: path.resolve(__dirname, '../build'),
+        publicPath: '/build/',
         filename: 'iview.js',
         library: 'iview',
         libraryTarget: 'umd',
diff --git a/config/webpack.dist.locale.config.js b/config/webpack.dist.locale.config.js
index f3ed821..247a4e1 100644
--- a/config/webpack.dist.locale.config.js
+++ b/config/webpack.dist.locale.config.js
@@ -21,8 +21,8 @@ module.exports = {
         ]
     },
     output: {
-        path: path.resolve(__dirname, '../dist/locale'),
-        publicPath: '/dist/locale/',
+        path: path.resolve(__dirname, '../build/locale'),
+        publicPath: '/build/locale/',
         filename: '[name].js',
         library: 'iview/locale',
         libraryTarget: 'umd',
diff --git a/config/webpack.dist.prod.config.js b/config/webpack.dist.prod.config.js
index ec98b52..f9e8f24 100644
--- a/config/webpack.dist.prod.config.js
+++ b/config/webpack.dist.prod.config.js
@@ -13,8 +13,8 @@ module.exports = merge(webpackBaseConfig, {
         main: './src/index.js'
     },
     output: {
-        path: path.resolve(__dirname, '../dist'),
-        publicPath: '/dist/',
+        path: path.resolve(__dirname, '../build'),
+        publicPath: '/build/',
         filename: 'iview.min.js',
         library: 'iview',
         libraryTarget: 'umd',
diff --git a/src/styles/custom.less b/src/styles/custom.less
index 403c3f0..205adeb 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -29,8 +29,12 @@
 
 @search-color           : @mew-common-color;
 @confirm-color          : #ff9a4c;
+@search-hover-color     : @mew-common-color;
+@confirm-hover-color    : #ff9a4c;
+
 @cancel-color           : @mew-white-color;
 @reset-color            : @mew-white-color;
+@reset-hover-color      : @mew-white-color;
 
 // Base
 @body-background        : #fff;
@@ -223,4 +227,4 @@
 @avatar-border-radius: @border-radius-small;
 
 // Anchor
-@anchor-border-width: 2px;
+@anchor-border-width: 2px;
\ No newline at end of file
--
libgit2 0.21.4