Merge branch 'master' of github.com:paulirish/html5-boilerplate

onepixelsolid · Aug 13, 2010 · 9182b30 · 9182b30
2 parents 0d40d84 + 4da4cf0
commit 9182b30
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 6 deletions.
diff --git a/404.html b/404.html
@@ -4,9 +4,9 @@
 <style>
 body { text-align: center;}
 h1 { font-size: 50px; }
-body { font: 20px Constantia, 'Hoefler Text',  "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5)}
+body { font: 20px Constantia, 'Hoefler Text',  "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
 a { color: rgb(36, 109, 56); text-decoration:none; }
-a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5) }
+a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
 span[frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
 </style>
 

diff --git a/index.html b/index.html
@@ -46,10 +46,7 @@
 <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->
 <!--[if IE 8 ]>    <body class="ie8"> <![endif]-->
 <!--[if IE 9 ]>    <body class="ie9"> <![endif]-->
-<!--[if gt IE 9]>  <body>             <![endif]-->
-<!--[if !IE]><!--> <body>         <!--<![endif]-->
-
-
+<!--[if (gt IE 9)|!(IE)]><!--> <body> <!--<![endif]-->
 
   <div id="container">
     <header>

diff --git a/nginx.conf b/nginx.conf
@@ -0,0 +1,68 @@
+user       www www;
+worker_processes  5;
+error_log  logs/error.log;
+pid        logs/nginx.pid;
+worker_rlimit_nofile 8192;
+
+events {
+  worker_connections  4096;
+}
+
+http {
+  include       mime.types;
+  default_type  application/octet-stream;
+  log_format   main '$remote_addr - $remote_user [$time_local]  $status '
+    '"$request" $body_bytes_sent "$http_referer" '
+    '"$http_user_agent" "$http_x_forwarded_for"';
+  access_log   logs/access.log  main;
+
+  keepalive_timeout  65;
+
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay off;
+
+  gzip  on;
+  gzip_http_version 1.0;
+  gzip_comp_level 2;
+  gzip_min_length 1100;
+  gzip_buffers     4 8k;
+  gzip_proxied any;
+  gzip_types text/html text/plain text/xml application/xml application/xml+rss text/css application/x-javascript text/javascript application/javascript application/json;
+
+  gzip_static on;
+
+  gzip_proxied        expired no-cache no-store private auth;
+  gzip_disable        "MSIE [1-6]\.";
+  gzip_vary           on;
+
+  server {
+    listen 80 default deferred;
+    server_name example.com;
+    expires 1M;
+
+    root /sites/example.com/public;
+
+    #static assets
+	location ~* ^.+\.(manifest)$ {
+      expires 0S;
+      root   /sites/example.com/public;
+      access_log logs/static.log;
+    }
+    location ~* ^.+\.(ico|ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|css|rss|atom|js|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$ {
+      # only set expires max IFF the file is a static file and exists
+      if (-f $request_filename) {
+        expires max;
+        root   /sites/example.com/public;
+        access_log logs/static.log;
+      }
+    }
+
+  }
+  server {
+    server_name www.example.com;
+    rewrite ^(.*) http://example.com$1 permanent;
+  }
+
+}
+