Merge pull request #431 from aslakknutsen/bootstrap_3

Update bootstrap initial generation to use Bootstrap 3

lib/awestruct/frameworks/bootstrap/base_index.html.haml

@@ -1,27 +1,29 @@
 ---
 layout: base
 ---
-.hero-unit
+.jumbotron
   %h1 You're awestruct!
-  %p This site is all setup to use Bootstrap 2 with Awestruct.
+  %p This site is all setup to use Bootstrap 3 with Awestruct.
   %p
-    %a.btn.btn-primary.btn-large{ :href=>'http://awestruct.org' }
+    %a.btn.btn-primary.btn-lg{ :href=>'http://awestruct.org', :role=>"button" }
       %i.icon-info-sign.icon-white
       Learn more »
-.row
-  .span4
-    %h2 About
-    %p Awestruct is a framework for creating static HTML sites. It's inspired by the awesome Jekyll utility in the same genre.
-    %p Additionally, Awestruct integrates technologies such as Compass, Markdown and Haml.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
-  .span4
-    %h2 Goal
-    %p The goal of Awestruct is to make it trivially easy to bake out non-trivial static websites. In addition to providing template-driven site creation (using Haml), Awestruct provides facilities for easily priming the site creation with additional non-page data.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
-  .span4
-    %h2 Concept
-    %p The core concept of Awestruct is that of structures, specifically Ruby OpenStruct structures. The struct aspect allows arbitrary, schema-less data to be associated with a specific page or the entire site.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
+
+.container-fluid
+  .row
+    .col-md-4
+      %h2 About
+      %p Awestruct is a framework for creating static HTML sites. It's inspired by the awesome Jekyll utility in the same genre.
+      %p Additionally, Awestruct integrates technologies such as Compass, Markdown and Haml.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »
+    .col-md-4
+      %h2 Goal
+      %p The goal of Awestruct is to make it trivially easy to bake out non-trivial static websites. In addition to providing template-driven site creation (using Haml), Awestruct provides facilities for easily priming the site creation with additional non-page data.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »
+    .col-md-4
+      %h2 Concept
+      %p The core concept of Awestruct is that of structures, specifically Ruby OpenStruct structures. The struct aspect allows arbitrary, schema-less data to be associated with a specific page or the entire site.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »

lib/awestruct/frameworks/bootstrap/base_layout.html.haml

@@ -12,13 +12,15 @@
     /[if lt IE 9]
       %script{ :type=>'text/javascript', :src=>'//html5shim.googlecode.com/svn/trunk/html5.js' }
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          %a.brand{ :href=>"#{site.base_url}" } #{site.name}
-          %ul.nav
-            %li
-              %a{ :href=>"#{site.base_url}" } Home
+    %nav.navbar.navbar-default.navbar-fixed-top{:role=>'navigation'}
+      .container-fluid
+        .navbar-header
+          %a.navbar-brand{ :href=>"#{site.base_url}" } #{site.name}
+
+        %ul.nav.navbar-nav.navbar-right
+          %li
+            %a{ :href=>"#{site.base_url}" } Home
+
     .container
       ~ content
       %hr