优化代码结构、布局方式

linking2014 · Oct 19, 2016 · 705a1a9 · 705a1a9
1 parent a70b0ec
commit 705a1a9
Show file tree

Hide file tree

Showing 8 changed files with 667 additions and 720 deletions.
diff --git a/build/index.html b/build/index.html
@@ -7,18 +7,16 @@
 </head>
 <body>
 <div class="container">
-    <div class="container-inner">
-        <div class="circle"></div>
-        <h1>
-            <span class="g1">G</span>
-            <span class="g2">o</span>
-            <span class="g3">o</span>
-            <span class="g4">g</span>
-            <span class="g5">l</span>
-            <span class="g6">e</span>
-        </h1>
-        <input type="text"/>
-    </div>
+    <div class="circle"></div>
+    <h1>
+        <span class="g1">G</span>
+        <span class="g2">o</span>
+        <span class="g3">o</span>
+        <span class="g4">g</span>
+        <span class="g5">l</span>
+        <span class="g6">e</span>
+    </h1>
+    <input type="text"/>
 </div>
 </body>
 </html>
diff --git a/build/style.css b/build/style.css
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,36 +1,15 @@
 var gulp = require('gulp');
 var gulpCssnano = require('gulp-cssnano');
 var gulpPlumber = require('gulp-plumber');
-var gulpReplace = require('gulp-replace');
-var gulpUglify = require('gulp-uglify');
-// var gulpImage = require('gulp-image');
 var gulpConnect = require('gulp-connect');
 var gulpSass = require('gulp-sass');
-// var webpackStream = require('webpack-stream');
-// var livereload = require('gulp-livereload');
-// var jade = require("gulp-jade");
-// var inlinesource = require('gulp-inline-source');
 var postcss = require('gulp-postcss');
 //var px2rem = require('postcss-px2rem');
 var autoprefixer = require('gulp-autoprefixer');
 
-//全局配置相关
-var config = {
-    //宏定义
-    macro: {
-        '__VERSION': Date.now().toString(16)
-    },
-    //发布目录
-    release: '../dist',
-    //webpack构建配置
-    webpack: {
-        index: './js/index.js'
-    }
-};
-
 gulp.task('sass', function () {
     //var processors = [px2rem({remUnit: 75})];
-    return gulp.src('./*.scss')
+    return gulp.src('./sass/*.scss')
         .pipe(gulpSass().on('error', gulpSass.logError))
         //.pipe(postcss(processors))
         .pipe(autoprefixer({
@@ -41,74 +20,32 @@ gulp.task('sass', function () {
 });
 
 gulp.task('css', ['sass'], function () {
-    return gulp.src(['./*.css', '!./css/animate.css'])
+    return gulp.src(['./*.css'])
         .pipe(gulpPlumber())
         .pipe(gulpCssnano())
         .pipe(gulp.dest('./build/'));
 });
 
-gulp.task('webpack', function () {
-    // return gulp.src('./js/*.js')
-    //     .pipe(webpackStream({
-    //         entry: config.webpack,
-    //         output: {
-    //             filename: '[name].bundle.js'
-    //         }
-    //     }))
-    //     .pipe(gulp.dest('./js/'));
-});
-
-gulp.task('js', ['webpack'], function () {
-    // return gulp.src(['./js/*.bundle.js', './js/flexible.js'])
-    //     .pipe(gulpPlumber())
-    //     .pipe(gulpUglify())
-    //     .pipe(gulp.dest('./build/js/'));
-});
-
-gulp.task('image', function () {
-    // return gulp.src('./img/*.+(jpg|png|gif|svg)')
-    //     .pipe(gulpImage())
-    //     .pipe(gulp.dest('./build/img/'));
-});
-
 gulp.task('font', function () {
-    // return gulp.src('./font/*.+(eot|svg|ttf|woff)')
-    //     .pipe(gulp.dest('./build/font/'));
-});
-
-gulp.task('jade', function () {
-    // return gulp.src(['jade/*.jade', '!jade/layout.jade'])
-    //     .pipe(jade({pretty: true}))
-    //     .pipe(inlinesource())
-    //     .pipe(gulp.dest('./'))
-});
-
-gulp.task('html', ['jade'], function () {
-    // return gulp.src('./*.html')
-    //     .pipe(gulp.dest('./build/'));
+     return gulp.src('./font/*.+(eot|svg|ttf|woff)')
+         .pipe(gulp.dest('./build/font/'));
 });
 
-gulp.task('macro', ['css', 'js', 'image', 'font', 'html'], function () {
-    var stream = gulp.src(['./build/**/*.css', './build/**/*.js', 'build/*.html']);
-    for (var key in config.macro) {
-        if (config.macro.hasOwnProperty(key)) {
-            stream = stream.pipe(gulpReplace(key, config.macro[key]));
-        }
-    }
-    return stream.pipe(gulp.dest('./build/'));
+gulp.task('html', function () {
+     return gulp.src('*.html')
+         .pipe(gulp.dest('./build/'));
 });
 
-gulp.task('default', ['macro'], function () {
-    return gulp.src('./**');
+gulp.task('default', ['css', 'font', 'html'], function () {
+    //return gulp.src('./**');
         // .pipe(gulp.dest(config.release));
 });
 
 gulp.task('watch', function () {
     // livereload.listen();
-    gulp.watch('sass/**/*.scss', ['sass']);
-    gulp.watch('css/**/*.css', ['css']);
-    gulp.watch('js/**/*.js', ['js']);
-    gulp.watch('jade/**/*.jade', ['html']);
+    gulp.watch('./sass/*.scss', ['css']);
+    //gulp.watch('*.css', ['css']);
+    gulp.watch('*.html', ['html']);
 });
 
 //启动一个本地调试服务器

diff --git a/index.html b/index.html
@@ -7,18 +7,16 @@
 </head>
 <body>
 <div class="container">
-    <div class="container-inner">
-        <div class="circle"></div>
-        <h1>
-            <span class="g1">G</span>
-            <span class="g2">o</span>
-            <span class="g3">o</span>
-            <span class="g4">g</span>
-            <span class="g5">l</span>
-            <span class="g6">e</span>
-        </h1>
-        <input type="text"/>
-    </div>
+    <div class="circle"></div>
+    <h1>
+        <span class="g1">G</span>
+        <span class="g2">o</span>
+        <span class="g3">o</span>
+        <span class="g4">g</span>
+        <span class="g5">l</span>
+        <span class="g6">e</span>
+    </h1>
+    <input type="text"/>
 </div>
 </body>
 </html>