Commit 333d7f853b8baa510eab3cc6d24ad6e17144237f
1 parent
fa7f82c3
update mew-iview
Showing
6 changed files
with
19 additions
and
10 deletions
Show diff stats
bot/default.js
| @@ -4,5 +4,10 @@ module.exports={ | @@ -4,5 +4,10 @@ module.exports={ | ||
| 4 | "build": [ | 4 | "build": [ |
| 5 | ["npm","install"], | 5 | ["npm","install"], |
| 6 | ["npm","run","dist"] | 6 | ["npm","run","dist"] |
| 7 | - ] | 7 | + ], |
| 8 | + "dists" : { | ||
| 9 | + "types" : "types", | ||
| 10 | + "dist" : "build", | ||
| 11 | + "src" : "src" | ||
| 12 | + } | ||
| 8 | } | 13 | } |
| 9 | \ No newline at end of file | 14 | \ No newline at end of file |
config/build-style.js
| @@ -13,13 +13,13 @@ gulp.task('css', function () { | @@ -13,13 +13,13 @@ gulp.task('css', function () { | ||
| 13 | })) | 13 | })) |
| 14 | .pipe(cleanCSS()) | 14 | .pipe(cleanCSS()) |
| 15 | .pipe(rename('iview.css')) | 15 | .pipe(rename('iview.css')) |
| 16 | - .pipe(gulp.dest('../dist/styles')); | 16 | + .pipe(gulp.dest('../build/styles')); |
| 17 | }); | 17 | }); |
| 18 | 18 | ||
| 19 | // 拷贝字体文件 | 19 | // 拷贝字体文件 |
| 20 | gulp.task('fonts', function () { | 20 | gulp.task('fonts', function () { |
| 21 | gulp.src('../src/styles/common/iconfont/fonts/*.*') | 21 | gulp.src('../src/styles/common/iconfont/fonts/*.*') |
| 22 | - .pipe(gulp.dest('../dist/styles/fonts')); | 22 | + .pipe(gulp.dest('../build/styles/fonts')); |
| 23 | }); | 23 | }); |
| 24 | 24 | ||
| 25 | gulp.task('default', ['css', 'fonts']); | 25 | gulp.task('default', ['css', 'fonts']); |
config/webpack.dist.dev.config.js
| @@ -12,8 +12,8 @@ module.exports = merge(webpackBaseConfig, { | @@ -12,8 +12,8 @@ module.exports = merge(webpackBaseConfig, { | ||
| 12 | main: './src/index.js' | 12 | main: './src/index.js' |
| 13 | }, | 13 | }, |
| 14 | output: { | 14 | output: { |
| 15 | - path: path.resolve(__dirname, '../dist'), | ||
| 16 | - publicPath: '/dist/', | 15 | + path: path.resolve(__dirname, '../build'), |
| 16 | + publicPath: '/build/', | ||
| 17 | filename: 'iview.js', | 17 | filename: 'iview.js', |
| 18 | library: 'iview', | 18 | library: 'iview', |
| 19 | libraryTarget: 'umd', | 19 | libraryTarget: 'umd', |
config/webpack.dist.locale.config.js
| @@ -21,8 +21,8 @@ module.exports = { | @@ -21,8 +21,8 @@ module.exports = { | ||
| 21 | ] | 21 | ] |
| 22 | }, | 22 | }, |
| 23 | output: { | 23 | output: { |
| 24 | - path: path.resolve(__dirname, '../dist/locale'), | ||
| 25 | - publicPath: '/dist/locale/', | 24 | + path: path.resolve(__dirname, '../build/locale'), |
| 25 | + publicPath: '/build/locale/', | ||
| 26 | filename: '[name].js', | 26 | filename: '[name].js', |
| 27 | library: 'iview/locale', | 27 | library: 'iview/locale', |
| 28 | libraryTarget: 'umd', | 28 | libraryTarget: 'umd', |
config/webpack.dist.prod.config.js
| @@ -13,8 +13,8 @@ module.exports = merge(webpackBaseConfig, { | @@ -13,8 +13,8 @@ module.exports = merge(webpackBaseConfig, { | ||
| 13 | main: './src/index.js' | 13 | main: './src/index.js' |
| 14 | }, | 14 | }, |
| 15 | output: { | 15 | output: { |
| 16 | - path: path.resolve(__dirname, '../dist'), | ||
| 17 | - publicPath: '/dist/', | 16 | + path: path.resolve(__dirname, '../build'), |
| 17 | + publicPath: '/build/', | ||
| 18 | filename: 'iview.min.js', | 18 | filename: 'iview.min.js', |
| 19 | library: 'iview', | 19 | library: 'iview', |
| 20 | libraryTarget: 'umd', | 20 | libraryTarget: 'umd', |
src/styles/custom.less
| @@ -29,8 +29,12 @@ | @@ -29,8 +29,12 @@ | ||
| 29 | 29 | ||
| 30 | @search-color : @mew-common-color; | 30 | @search-color : @mew-common-color; |
| 31 | @confirm-color : #ff9a4c; | 31 | @confirm-color : #ff9a4c; |
| 32 | +@search-hover-color : @mew-common-color; | ||
| 33 | +@confirm-hover-color : #ff9a4c; | ||
| 34 | + | ||
| 32 | @cancel-color : @mew-white-color; | 35 | @cancel-color : @mew-white-color; |
| 33 | @reset-color : @mew-white-color; | 36 | @reset-color : @mew-white-color; |
| 37 | +@reset-hover-color : @mew-white-color; | ||
| 34 | 38 | ||
| 35 | // Base | 39 | // Base |
| 36 | @body-background : #fff; | 40 | @body-background : #fff; |
| @@ -223,4 +227,4 @@ | @@ -223,4 +227,4 @@ | ||
| 223 | @avatar-border-radius: @border-radius-small; | 227 | @avatar-border-radius: @border-radius-small; |
| 224 | 228 | ||
| 225 | // Anchor | 229 | // Anchor |
| 226 | -@anchor-border-width: 2px; | 230 | -@anchor-border-width: 2px; |
| 231 | +@anchor-border-width: 2px; | ||
| 227 | \ No newline at end of file | 232 | \ No newline at end of file |