Commit 967e8e43127c00e4d9c7d794851ff5e48ddb115f

Authored by Aresn
Committed by GitHub
2 parents 4997bd42 c058dcb3

Merge pull request #91 from jingsam/clean-code

clean style
build/build-style.js
1   -/**
2   - * 编译样式文件
3   - * iview.css 是基础组件css
4   - * iview.pack.css 是套装的全部css
5   - * iview.all.css 是基础组件加套装的全部css
6   - * packages/*.css 是某个套装的css
7   - * article.css 是文章排版的css
8   - * */
9 1 var gulp = require('gulp');
10 2 var minifyCSS = require('gulp-minify-css');
11 3 var less = require('gulp-less');
12 4 var rename = require('gulp-rename');
13   -var concat = require('gulp-concat');
  5 +var autoprefixer = require('gulp-autoprefixer');
14 6  
15   -// 组件的基础css
16   -gulp.task('base', function () {
  7 +// 编译less
  8 +gulp.task('css', function () {
17 9 gulp.src('../src/styles/index.less')
18 10 .pipe(less())
  11 + .pipe(autoprefixer({
  12 + browsers: ['last 2 versions']
  13 + }))
19 14 .pipe(minifyCSS())
20 15 .pipe(rename('iview.css'))
21 16 .pipe(gulp.dest('../dist/styles'))
22 17 });
23 18  
24   -// 字体
  19 +// 拷贝字体文件
25 20 gulp.task('fonts', function () {
26 21 gulp.src('../src/styles/common/iconfont/fonts/*.*')
27 22 .pipe(gulp.dest('../dist/styles/fonts'))
28 23 });
29 24  
30   -// 文章排版
31   -gulp.task('article', function () {
32   - gulp.src('../src/styles/article/index.less')
33   - .pipe(less())
34   - .pipe(minifyCSS())
35   - .pipe(rename('article.css'))
36   - .pipe(gulp.dest('../dist/styles'))
37   -});
38   -
39   -// 套装的全部css
40   -gulp.task('pack-all', function () {
41   - gulp.src('../src/styles/package.less')
42   - .pipe(less())
43   - .pipe(minifyCSS())
44   - .pipe(rename('iview.pack.css'))
45   - .pipe(gulp.dest('../dist/styles'))
46   -});
47   -
48   -// 每个套装的css
49   -gulp.task('pack', function () {
50   - gulp.src(['../src/styles/packages/*.less', '!../src/styles/packages/index.less'])
51   - .pipe(less())
52   - .pipe(minifyCSS())
53   - .pipe(rename({
54   - prefix: 'iview.pack.'
55   - }))
56   - .pipe(gulp.dest('../dist/styles/packages'))
57   -});
58   -
59   -// 全部css(包含组件和套装)
60   -gulp.task('all', function () {
61   - gulp.src(['../src/styles/index.less', '../src/styles/package.less'])
62   - .pipe(less())
63   - .pipe(concat('iview.all.css'))
64   - .pipe(minifyCSS())
65   - .pipe(gulp.dest('../dist/styles'))
66   -});
67   -
68   -gulp.task('default', ['base', 'fonts', 'article', 'pack-all', 'pack', 'all']);
69 25 \ No newline at end of file
  26 +gulp.task('default', ['css', 'fonts']);
... ...
package.json
... ... @@ -56,7 +56,7 @@
56 56 "extract-text-webpack-plugin": "^1.0.1",
57 57 "file-loader": "^0.8.5",
58 58 "gulp": "^3.9.1",
59   - "gulp-concat": "^2.6.0",
  59 + "gulp-autoprefixer": "^3.1.1",
60 60 "gulp-less": "^3.1.0",
61 61 "gulp-minify-css": "^1.2.4",
62 62 "gulp-rename": "^1.2.2",
... ...
src/styles/README.md
... ... @@ -2,10 +2,12 @@
2 2  
3 3 ## 目录
4 4  
5   -|-- components (组件样式)
  5 +|-- animation (动画)
6 6  
7 7 |-- common (全局样式)
8 8  
9   -|-- packages (套装)
  9 +|-- components (组件样式)
  10 +
  11 +|-- mixins (混入)
10 12  
11   -|-- themes (皮肤)
12 13 \ No newline at end of file
  14 +|-- themes (主题)
... ...
src/styles/article/index.less renamed to src/styles/common/article.less
src/styles/package.less deleted
1   -@import "./themes/default/index";
2   -@import "./packages/index";
3 0 \ No newline at end of file
src/styles/packages/index.less deleted
1   -@import "signin";
2   -@import "signup";
3 0 \ No newline at end of file
src/styles/packages/signin.less deleted
1   -.signin{
2   - color: #f00;
3   -}
4 0 \ No newline at end of file
src/styles/packages/signup.less deleted
1   -.signup{
2   - color: #f60;
3   -}
4 0 \ No newline at end of file
test/app.vue
1 1 <style lang="less">
2 2 @import "../src/styles/index.less";
3   - @import "../src/styles/package.less";
4   - @import "../src/styles/article/index.less";
5 3 </style>
6 4 <style scoped>
7 5 nav {
... ...