Merge branch 'master' of https://github.com/w3ctrain/w3ctrain.github.io

Conflicts: js/main.min.js
HelKyle · Dec 19, 2015 · 9581e22 · 9581e22
2 parents c3bb23c + 66371db
commit 9581e22
Show file tree

Hide file tree

Showing 7 changed files with 2,132 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /node_modules
+/gulpfile.js
 *.scssc
 *.DS_Store
 *.codekit
diff --git a/app/index.html b/app/index.html
@@ -269,6 +269,9 @@ <h3 id="tool" class="section__header">前端工具</h3>
                 <dd class="links-item">
                   <a href="http://runjs.cn/" target="_blank">Runjs</a>
                 </dd>
+                <dd class="links-item">
+                  <a href="http://sassmeister.com/" target="_blank">sassmeister</a>
+                </dd>
               </dl>
               <dl class="links-list">
                 <dt class="links-title arrow-box">调试/测试</dt>

diff --git a/app/jade/index.jade b/app/jade/index.jade
@@ -183,6 +183,7 @@ body
                   +dd("http://codepen.io/", "Codepen",0 , 10087)
                   +dd("http://jsbin.com", "Jsbin")
                   +dd("http://runjs.cn/", "Runjs")
+                  +dd("http://sassmeister.com/", "sassmeister")
                 dl.links-list
                   +dt("调试/测试")
                   +dd("http://getfirebug.com/", "Firebug")

diff --git a/css/main.min.css b/css/main.min.css
diff --git a/img/fs-tags.png b/img/fs-tags.png
diff --git a/index.html b/index.html
@@ -267,6 +267,9 @@ <h3 id="tool" class="section__header">前端工具</h3>
                 <dd class="links-item">
                   <a href="http://runjs.cn/" target="_blank">Runjs</a>
                 </dd>
+                <dd class="links-item">
+                  <a href="http://sassmeister.com/" target="_blank">sassmeister</a>
+                </dd>
               </dl>
               <dl class="links-list">
                 <dt class="links-title arrow-box">调试/测试</dt>

diff --git a/package.json b/package.json
@@ -28,7 +28,11 @@
     "gulp-rev-replace": "^0.4.2",
     "gulp-sass": "^2.1.0",
     "gulp-uglify": "^1.5.1",
-    "gulp-useref": "^1.2.0",
+    "gulp-useref": "^3.0.3",
+    "gulp-util": "^3.0.7",
     "run-sequence": "^1.1.5"
+  },
+  "dependencies": {
+    "del": "^2.2.0"
   }
 }