Merge remote-tracking branch 'origin/develop' into develop

@@ -13,14 +13,16 @@ const ftp = require('gulp-ftp');
 const postcss = require('gulp-postcss');
 const postcss = require('gulp-postcss');
 const sourcemaps = require('gulp-sourcemaps');
 const sourcemaps = require('gulp-sourcemaps');
 const cssnano = require('gulp-cssnano');
 const cssnano = require('gulp-cssnano');
+const scss = require('postcss-scss');
 
 
 const webpack = require('webpack');
 const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
 const WebpackDevServer = require('webpack-dev-server');
-const webpackConfig = require('./webpack.config.js');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const Dashboard = require('webpack-dashboard');
 const Dashboard = require('webpack-dashboard');
 const DashboardPlugin = require('webpack-dashboard/plugin');
 const DashboardPlugin = require('webpack-dashboard/plugin');
 
 
+const webpackConfig = require('./webpack.config.js');
+
 const env = {
 const env = {
     dev: Symbol('development'),
     dev: Symbol('development'),
     pro: Symbol('production')
     pro: Symbol('production')
@@ -48,7 +50,7 @@ const dist = {
 const postcssPlugin = (et) => {
 const postcssPlugin = (et) => {
     let sprites = {
     let sprites = {
             spritesmith: {
             spritesmith: {
-                padding: 2
+                padding: 8
             },
             },
             filterBy(file) {
             filterBy(file) {
                 // base64 的图片没有 url 过滤掉
                 // base64 的图片没有 url 过滤掉
@@ -60,7 +62,7 @@ const postcssPlugin = (et) => {
             groupBy(file) {
             groupBy(file) {
                 let group = file.url.split('/')[1];
                 let group = file.url.split('/')[1];
 
 
-                group = group === '' ? 'yo' : group;
+                group = group === '' ? 'yoho' : group;
 
 
                 file.retina = true;
                 file.retina = true;
 
 
@@ -193,12 +195,12 @@ gulp.task('webpack-dev-server', () => {
             postcss: {
             postcss: {
                 plugins: postcssPlugin(env.dev),
                 plugins: postcssPlugin(env.dev),
                 options: {
                 options: {
-                    parser: require('postcss-scss')
+                    parser: scss
                 }
                 }
             },
             },
             autoprefixer: false,
             autoprefixer: false,
             loaders: {
             loaders: {
-                css: ExtractTextPlugin.extract(['css?-url'])
+                css: ExtractTextPlugin.extract(['css?-url&sourceMap'])
             }
             }
         }
         }
     });
     });
@@ -243,7 +245,7 @@ gulp.task('webpack', ['assets'], (done) => {
             postcss: {
             postcss: {
                 plugins: postcssPlugin(env.pro),
                 plugins: postcssPlugin(env.pro),
                 options: {
                 options: {
-                    parser: require('postcss-scss')
+                    parser: scss
                 }
                 }
             },
             },
             autoprefixer: false,
             autoprefixer: false,
@@ -255,13 +257,12 @@ gulp.task('webpack', ['assets'], (done) => {
 
 
     proConfig.output.path = dist.js;
     proConfig.output.path = dist.js;
 
 
-    // TODO: 生产环境加载的插件独立出来
+    // 生产环境插件
     proConfig.plugins.push(new webpack.DefinePlugin({
     proConfig.plugins.push(new webpack.DefinePlugin({
         'process.env': {
         'process.env': {
             NODE_ENV: '"production"'
             NODE_ENV: '"production"'
         }
         }
-    }));
-    proConfig.plugins.push(new webpack.optimize.UglifyJsPlugin({
+    }), new webpack.optimize.UglifyJsPlugin({
         compress: {
         compress: {
             warnings: false
             warnings: false
         }
         }

@@ -40,7 +40,7 @@
                         <img :src="item.thumb | resize 213 134"/>
                         <img :src="item.thumb | resize 213 134"/>
                     </a>
                     </a>
                 </div>
                 </div>
-                <h3><a :href="`/editorial/${item.id}.html`">{{item.title}}</a></h3>
+                <h3><a class="line-clamp-2" :href="`/editorial/${item.id}.html`">{{item.title}}</a></h3>
                 <div class="sub-time">
                 <div class="sub-time">
                     <span class="icon icon-timeshare"></span><span class="label">{{article.publishTime | formatUnixTime 'MM.DD HH:mm'}}</span>
                     <span class="icon icon-timeshare"></span><span class="label">{{article.publishTime | formatUnixTime 'MM.DD HH:mm'}}</span>
                 </div>
                 </div>

@@ -7,7 +7,9 @@
                     <img v-lazy="editorial.src | resize 750 469" alt="" />
                     <img v-lazy="editorial.src | resize 750 469" alt="" />
                 </a>
                 </a>
             </div>
             </div>
-            <div class="title"><a class="line-clamp-2" href='{{"/editorial/" + editorial.id + ".html"}}'>{{editorial.title}}</a></div>
+            <div class="title">
+                <a class="line-clamp-2" href='{{"/editorial/" + editorial.id + ".html"}}'>{{editorial.title}}</a>
+            </div>
             <div class="editorial-des">
             <div class="editorial-des">
                 <p class="line-clamp-2">{{editorial.intro}}</p>
                 <p class="line-clamp-2">{{editorial.intro}}</p>
             </div>
             </div>
@@ -43,6 +45,10 @@
             line-height: 43px;
             line-height: 43px;
             font-weight: 700;
             font-weight: 700;
             padding: 30px;
             padding: 30px;
+
+            a {
+                height: 86px;
+            }
         }
         }
 
 
         .editorial-des {
         .editorial-des {

@@ -13,6 +13,10 @@
     .blk-header {
     .blk-header {
         transition: 0.3s all;
         transition: 0.3s all;
     }
     }
+
+    .ghost .blk-header {
+        color: #fff;
+    }
 </style>
 </style>
 
 
 <script>
 <script>
@@ -84,7 +88,7 @@
 
 
                 if (topHeight > 100) {
                 if (topHeight > 100) {
                     topChange = false;
                     topChange = false;
-                } 
+                }
 
 
                 this.$refs.header.$el.classList.toggle('ghost', topChange);
                 this.$refs.header.$el.classList.toggle('ghost', topChange);
             }
             }