From ddd2b1339e908ea4a42139dc3814529f7701616e Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 19 Dec 2010 17:12:26 -0800
Subject: [PATCH] minify & combine css

---
 Makefile                       |  2 +-
 combine.sh                     |  7 +++++--
 index.html                     |  6 +++---
 minify.sh                      |  8 ++++++++
 templates/blog/index.html      |  2 +-
 templates/blog/post.html       |  2 +-
 templates/proj/index.html      | 12 ++++++------
 templates/proj/proj/index.html |  9 +++------
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index a3def96..c54beee 100644
--- a/Makefile
+++ b/Makefile
@@ -44,4 +44,4 @@ clean:
 	rm -rf blog/*
 	rm assets/*.min.js
 
-.PHONY: proj
+.PHONY: proj blog
diff --git a/combine.sh b/combine.sh
index 2fd97f0..4b40fd6 100755
--- a/combine.sh
+++ b/combine.sh
@@ -3,5 +3,8 @@
 echo "request,showdown,strftime,tmpl,jquery-serializeObject,blog -> assets/blog-all.min.js"
 cat assets/{request,showdown,strftime,tmpl,jquery-serializeObject,blog}.min.js >|assets/blog-all.min.js
 
-echo "gitter.storage-polyfill,store,proj -> assets/proj-all.min.js"
-cat assets/{gitter,storage-polyfill,store,proj}.min.js >|assets/proj-all.min.js
+echo "gitter.store,proj -> assets/proj-all.min.js"
+cat assets/{gitter,store,proj}.min.js >|assets/proj-all.min.js
+
+echo "style,proj -> assets/proj-all.min.css"
+cat assets/{style,proj}.min.css >|assets/proj-all.min.css
diff --git a/index.html b/index.html
index c55e112..bb2a8e9 100644
--- a/index.html
+++ b/index.html
@@ -3,12 +3,12 @@
   <meta charset=utf-8>
   <meta name=viewport content=width=device-width>
   <title>samhuri.net</title>
-  <link rel=stylesheet href=assets/style.css>
+  <link rel=stylesheet href=assets/style.min.css>
   <!--[if lt IE 7]>
-  <link rel=stylesheet href=assets/ie6.css>
+  <link rel=stylesheet href=assets/ie6.min.css>
   <![endif]-->
   <!--[if lt IE 8]>
-  <link rel=stylesheet href=assets/ie7.css>
+  <link rel=stylesheet href=assets/ie7.min.css>
   <![endif]-->
   <script>
   var _gaq = _gaq || [];
diff --git a/minify.sh b/minify.sh
index acbe575..7783c45 100755
--- a/minify.sh
+++ b/minify.sh
@@ -9,3 +9,11 @@ for js (assets/*.js~*.min.js) {
 	closure-compiler < $js >| $target
     fi
 }
+
+for css (assets/*.css~*.min.css) {
+    target=${css%.css}.min.css
+    if [ ! -f $target ] || [ $css -nt $target ]; then
+	echo "$css -> $target"
+	yui-compressor $css $target
+    fi
+}
\ No newline at end of file
diff --git a/templates/blog/index.html b/templates/blog/index.html
index d767a7b..6bf70bb 100644
--- a/templates/blog/index.html
+++ b/templates/blog/index.html
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <meta name=viewport content=width=device-width>
 <title>sjs' blog</title>
-<link rel=stylesheet href=../assets/blog.css>
+<link rel=stylesheet href=../assets/blog.min.css>
 <link rel=alternate type=application/rss+xml href=http://samhuri.net/blog/sjs.rss title="sjs' blog">
 <script src=http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js></script>
 <script>
diff --git a/templates/blog/post.html b/templates/blog/post.html
index bdcdc14..572608c 100644
--- a/templates/blog/post.html
+++ b/templates/blog/post.html
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <meta name=viewport content=width=device-width>
 <title>{{title}} :: samhuri.net</title>
-<link rel=stylesheet href=../assets/blog.css>
+<link rel=stylesheet href=../assets/blog.min.css>
 <link rel=alternate type=application/rss+xml href=http://samhuri.net/blog/sjs.rss title="sjs' blog">
 <script>
 var _gaq = _gaq || [];
diff --git a/templates/proj/index.html b/templates/proj/index.html
index ac3f09f..720a287 100644
--- a/templates/proj/index.html
+++ b/templates/proj/index.html
@@ -3,14 +3,14 @@
   <meta charset=utf-8> 
   <meta name=viewport content=width=device-width>
   <title>projects :: samhuri.net</title> 
-  <link rel=stylesheet href=../assets/style.css>
+  <link rel=stylesheet href=../assets/style.min.css>
   <!--[if IE 6]>
-  <link rel=stylesheet href=../assets/ie6.css>
+  <link rel=stylesheet href=../assets/ie6.min.css>
   <![endif]-->
   <!--[if lt IE 8]>
-  <link rel=stylesheet href=../assets/ie7.css>
+  <link rel=stylesheet href=../assets/ie7.min.css>
   <script src=http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js></script>
-  <script src=../assets/storage-polyfill.js></script>
+  <script src=../assets/storage-polyfill.min.js></script>
   <![endif]-->
   <style>
     #gh { text-align: center }
@@ -29,8 +29,8 @@
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
   </script>
-  <script src=../assets/gitter.js></script>
-  <script src=../assets/store.js></script>
+  <script src=../assets/gitter.min.js></script>
+  <script src=../assets/store.min.js></script>
   <script>
   if (typeof console === 'undefined') {
     console = {log:function(){}}
diff --git a/templates/proj/proj/index.html b/templates/proj/proj/index.html
index 781f14b..a4b41ec 100644
--- a/templates/proj/proj/index.html
+++ b/templates/proj/proj/index.html
@@ -3,8 +3,7 @@
   <meta charset=utf-8>
   <meta name=viewport content=width=device-width>
   <title>{{name}} :: samhuri.net</title>
-  <link rel=stylesheet href=../../assets/style.css>
-  <link rel=stylesheet href=../../assets/proj.css>
+  <link rel=stylesheet href=../../assets/proj-all.min.css>
   <script>
   var _gaq = _gaq || [];
   _gaq.push( ['_setAccount', 'UA-214054-5']
@@ -19,11 +18,9 @@
   </script>
   <!--[if lt IE 8]>
   <script src=http://d1eqzjbvoh1rux.cloudfront.net/json2.min.js></script>
-  <script src=../../assets/storage-polyfill.js></script>
+  <script src=../../assets/storage-polyfill.min.js></script>
   <![endif]-->
-  <script src=../../assets/gitter.js></script>
-  <script src=../../assets/store.js></script>
-  <script src=../../assets/proj.js></script>
+  <script src=../../assets/proj-all.min.js></script>
   <script> SJS.proj('{{name}}') </script>
 </head>
 <nav id=breadcrumbs><a href=../../>samhuri.net</a> &rarr; <a href=../>projects</a></nav>