layouts, min.js, 404

tzvetkoff · Oct 6, 2014 · 4cc0e1d · 4cc0e1d
1 parent 354827d
commit 4cc0e1d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 29 deletions.
diff --git a/404.html b/404.html
@@ -20,9 +20,7 @@
   <link rel="apple-touch-icon" href="/assets/images/pirate.png" />
 
   <!-- stylesheets and javascripts -->
-  <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/main.min.css" />
-  <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/syntax.min.css" />
-  <link rel="stylesheet" type="text/css" media="screen, projection" href="http://fonts.googleapis.com/css?family=PT+Sans:400,700,700italic&amp;subset=latin,latin-ext,cyrillic" />
+  <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/main.css" />
   <script type="text/javascript" src="/assets/javascripts/main.min.js"></script>
 </head>
 <body>

diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,16 @@
 permalink: /posts/:year/:month/:day/:title.html
 
-exclude: [".ruby-version", ".ruby-gemset", "Gemfile", "Gemfile.lock", "README.md", "CNAME", "package.json", "build.js", "node_modules"]
+exclude:
+- .ruby-version
+- .ruby-gemset
+- Gemfile
+- Gemfile.lock
+- README.md
+- CNAME
+- package.json
+- build.js
+- node_modules
+- assets/javascripts/main.js
 markdown: kramdown
 highlighter: pygments
 

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -20,7 +20,7 @@
   <!-- stylesheets and javascripts -->
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/main.css" />
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/syntax.css" />
-  <script type="text/javascript" src="/assets/javascripts/main.js"></script>
+  <script type="text/javascript" src="/assets/javascripts/main.min.js"></script>
 </head>
 <body>
   <div id="wrapper" class="default">

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -20,7 +20,7 @@
   <!-- stylesheets and javascripts -->
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/main.css" />
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/syntax.css" />
-  <script type="text/javascript" src="/assets/javascripts/main.js"></script>
+  <script type="text/javascript" src="/assets/javascripts/main.min.js"></script>
 </head>
 <body>
   <div id="wrapper" class="page">

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -20,7 +20,7 @@
   <!-- stylesheets and javascripts -->
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/main.css" />
   <link rel="stylesheet" type="text/css" media="screen, projection" href="/assets/stylesheets/syntax.css" />
-  <script type="text/javascript" src="/assets/javascripts/main.js"></script>
+  <script type="text/javascript" src="/assets/javascripts/main.min.js"></script>
 </head>
 <body>
   <div id="wrapper" class="post">

diff --git a/assets/javascripts/main.min.js b/assets/javascripts/main.min.js
diff --git a/build.js b/build.js
@@ -2,13 +2,7 @@
 
 var
   fs = require('fs'),
-  cssProcessor = require('clean-css'),
   jsProcessor = require('uglify-js'),
-  cssConfig = {
-    keepSpecialComments     : 0,
-    keepBreaks              : false,
-    debug                   : false,
-  },
   jsConfig = {
     fromString              : true,
     copyright               : false,
@@ -18,9 +12,6 @@ var
     unused                  : false,
   };
 
-function css(source) {
-  return new cssProcessor(cssConfig).minify(source);
-}
 function js(source) {
   return jsProcessor.minify(source, jsConfig);
 }
@@ -33,18 +24,6 @@ function write(filename, contents) {
 
 var
   jsDev   = read('assets/javascripts/main.js'),
-  jsMin   = js(jsDev, jsConfig).code,
-
-  ieDev   = read('assets/javascripts/ie.js'),
-  ieMin   = js(ieDev, jsConfig).code,
-
-  cssDev  = read('assets/stylesheets/main.css'),
-  cssMin  = css(cssDev, cssConfig),
-
-  synDev  = read('assets/stylesheets/syntax.css'),
-  synMin  = css(synDev, cssConfig);
+  jsMin   = js(jsDev, jsConfig).code;
 
 write('assets/javascripts/main.min.js', jsMin);
-write('assets/javascripts/ie.min.js', ieMin);
-write('assets/stylesheets/main.min.css', cssMin);
-write('assets/stylesheets/syntax.min.css', synMin);