Merge pull request nightscout#8 from peterhaldbaek/master

Upgrade to Bootstrap 3.0.3 with Bower

.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "src/files/vendor"
+}

.gitignore

@@ -3,3 +3,6 @@ out/
 .idea/
 .DS_Store
 *.iml
+src/files/vendor/components-bootstrap
+src/files/vendor/jquery
+.docpad.db

bower.json

@@ -0,0 +1,6 @@
+{
+  "name": "twitter-bootstrap-jade.docpad",
+  "dependencies": {
+    "components-bootstrap": "~3.0.3"
+  }
+}

docpad.coffee

@@ -40,7 +40,7 @@ docpadConfig =
       email: "[email protected]"
 
       # Your company's name
-      copyright: "© Your Company 2012"
+      copyright: "© Your Company 2013"
 
 
     # Helper Functions

package.json

@@ -1,49 +1,53 @@
 {
-	"name": "twitter-bootstrap.docpad",
-	"version": "0.9.0",
-	"description": "Twitter Bootstrap skeleton for DocPad. Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.",
-	"homepage": "https://github.com/bevry/twitter-bootstrap.docpad",
-	"keywords": [
-		"docpad-skeleton",
-		"docpad",
-		"website",
-		"bootstrap",
-		"twitter bootstrap"
-	],
-	"author": "Bevry Pty Ltd <[email protected]> (http://bevry.me)",
-	"maintainers": [
-		"Benjamin Lupton <[email protected]> (http://balupton.com)"
-	],
-	"contributors": [
-		"Benjamin Lupton <[email protected]> (http://balupton.com)"
-	],
-	"bugs": {
-		"url": "https://github.com/docpad/twitter-bootstrap.docpad/issues"
-	},
-	"repository" : {
-		"type" : "git",
-		"url" : "http://github.com/docpad/twitter-bootstrap.docpad.git"
-	},
-	"engines" : {
-		"node": "0.8.x",
-		"npm": "1.1.x"
-	},
-	"dependencies": {
-		"docpad": "6.x",
-		"docpad-plugin-cleanurls": "2.x",
-		"docpad-plugin-coffeescript": "2.x",
-		"docpad-plugin-eco": "2.x",
-		"docpad-plugin-less": "2.x",
-		"docpad-plugin-marked": "2.x",
-		"docpad-plugin-partials": "2.x",
-		"docpad-plugin-stylus": "2.x",
-		"docpad-plugin-text": "2.x",
-		"docpad-plugin-jade": "2.x",
-		"docpad-plugin-related": "2.x",
+  "name": "twitter-bootstrap.docpad",
+  "version": "0.9.0",
+  "description": "Twitter Bootstrap skeleton for DocPad. Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.",
+  "homepage": "https://github.com/bevry/twitter-bootstrap.docpad",
+  "keywords": [
+    "docpad-skeleton",
+    "docpad",
+    "website",
+    "bootstrap",
+    "twitter bootstrap"
+  ],
+  "author": "Bevry Pty Ltd <[email protected]> (http://bevry.me)",
+  "maintainers": [
+    "Benjamin Lupton <[email protected]> (http://balupton.com)"
+  ],
+  "contributors": [
+    "Benjamin Lupton <[email protected]> (http://balupton.com)"
+  ],
+  "bugs": {
+    "url": "https://github.com/docpad/twitter-bootstrap.docpad/issues"
+  },
+  "repository" : {
+    "type" : "git",
+    "url" : "http://github.com/docpad/twitter-bootstrap.docpad.git"
+  },
+  "engines" : {
+    "node": "0.8.x",
+    "npm": "1.1.x"
+  },
+  "dependencies": {
+    "docpad": "6.x",
+    "docpad-plugin-cleanurls": "2.x",
+    "docpad-plugin-coffeescript": "2.x",
+    "docpad-plugin-eco": "2.x",
+    "docpad-plugin-less": "2.x",
+    "docpad-plugin-marked": "2.x",
+    "docpad-plugin-partials": "2.x",
+    "docpad-plugin-stylus": "2.x",
+    "docpad-plugin-text": "2.x",
+    "docpad-plugin-jade": "2.x",
+    "docpad-plugin-related": "2.x",
     "marked": "*"
-	},
-	"devDependencies": {
-		"docpad-plugin-livereload": "2.x"
-	},
-	"main": "node_modules/docpad/bin/docpad-server"
+  },
+  "devDependencies": {
+    "docpad-plugin-livereload": "2.x",
+    "bower": "~1"
+  },
+  "main": "node_modules/docpad/bin/docpad-server",
+  "scripts": {
+    "postinstall": "node node_modules/bower/bin/bower install"
+  }
 }

src/documents/404.html.jade

@@ -4,7 +4,7 @@ title: '404 Not Found'
 dynamic: true
 ---
 
-.hero-unit
+.jumbotron
   h1 404 Not Found
   p
     | Ooops! It looks like the document you requested at <code>#{req.url}</code> couldn't be found.

src/documents/500.html.jade

@@ -4,7 +4,7 @@ title: '500 Internal Server Error'
 dynamic: true
 ---
 
-.hero-unit
+.jumbotron
   h1 500 Internal Server Error
   p
     | Ooops! Something went wrong while we were processing your request to <code>#{req.url}</code>. Here's the details:

src/documents/index.html.jade

@@ -4,7 +4,7 @@ title: 'Home'
 ---
 
 // Main hero unit for a primary marketing message or call to action.
-.hero-unit
+.jumbotron
   h1 Welcome to your new site!
   p: :markdown
     We've copied over the [Twitter Bootstrap Skeleton](https://github.com/docpad/twitter-bootstrap.docpad) for you already, which is what you're currently viewing.
@@ -13,11 +13,11 @@ title: 'Home'
 
 // Example row of columns.
 .row
-  .span6
+  .col-md-6
     h2 Docpad
     p DocPad takes that good ol' simple approach of writing files and wraps it with the best modern innovations, providing an awesome intuitive, liberating and empowering solution for HTML5 web development.</p>
-    p: a.btn(href="https://github.com/bevry/docpad") Visit Website
-  .span6
+    p: a.btn.btn-default(href="https://github.com/bevry/docpad") Visit Website
+  .col-md-6
     h2 Twitter Bootstrap
     p Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.</p>
-    p: a.btn(href="http://twitter.github.com/bootstrap/") Visit Website
+    p: a.btn.btn-default(href="http://twitter.github.com/bootstrap/") Visit Website