[master] Used vs 2015 to bundle css files.

gqy117 · May 14, 2016 · 7ee01e2 · 7ee01e2
1 parent 615df47
commit 7ee01e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/WebSite/Gulpfile.js b/WebSite/Gulpfile.js
@@ -73,8 +73,8 @@ gulp.task('watch', function() {
     gulp.watch(jsPath, ['jshint']);
     gulp.watch(tsPath, ['ts']);
     gulp.watch(tsPath, ['tslint']);
-    gulp.watch(tsPath, ['bundle-css']);
+    // gulp.watch(tsPath, ['bundle-css']);
 });
 
 // init
-gulp.task('default', ['jshint', 'ts', 'tslint', 'bundle-css']);
+gulp.task('default', ['jshint', 'ts', 'tslint']);
diff --git a/WebSite/WebTool/App_Start/Bundle/BundleConfig.cs b/WebSite/WebTool/App_Start/Bundle/BundleConfig.cs
@@ -9,7 +9,7 @@ public static class BundleConfig
         public static void RegisteCSS(BundleCollection bundles)
         {
             var cssBundle = new StyleBundle("~/Content/AllCSS");
-            cssBundle.Include("~/Content/all.css");
+            cssBundle.Include("~/Content/all.min.css");
 
             bundles.Add(cssBundle);
         }

diff --git a/WebSite/WebTool/bundleconfig.json b/WebSite/WebTool/bundleconfig.json
@@ -1,6 +1,6 @@
 [
     // all.css
-    /*{
+    {
         "outputFileName": "Content/all.css",
         "inputFiles": [
             "Content/assets/bootstrap/css/bootstrap.min.css",
@@ -23,7 +23,7 @@
             "commentMode": "none",
             "outputMode": "singleLine"
         }
-    },*/
+    },
 
     // main.js
     {