Merge pull request #132 from jkuchta/master

plusjade · plusjade · commit fcff62cca4d2 · 2013-02-23T23:23:08.000-08:00
Fully take advantage of bootstrap awesomeness but responsive
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
@@ -6,6 +6,9 @@
     {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %}
     <meta name="author" content="{{ site.author.name }}">
 
+    <!-- Enable responsive viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -28,7 +31,7 @@
 
     <div class="navbar">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
           <a class="brand" href="{{ HOME_PATH }}">{{ site.title }}</a>
           <ul class="nav">
             {% assign pages_list = site.pages %}
@@ -39,7 +42,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="container-fluid">
 
       <div class="content">
         {{ content }}
@@ -52,7 +55,7 @@
         </p>
       </footer>
 
-    </div> <!-- /container -->
+    </div> <!-- /container-fluid -->
 
     {% include JB/analytics %}
   </body>
diff --git a/_includes/themes/twitter/page.html b/_includes/themes/twitter/page.html
@@ -2,7 +2,7 @@
   <h1>{{ page.title }} {% if page.tagline %} <small>{{ page.tagline }}</small>{% endif %}</h1>
 </div>
 
-<div class="row">
+<div class="row-fluid">
   <div class="span12">
     {{ content }}
   </div>
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html
@@ -2,7 +2,7 @@
   <h1>{{ page.title }} <small>Supporting tagline</small></h1>
 </div>
 
-<div class="row">
+<div class="row-fluid">
   <div class="span8">
     {{ content }}
     <hr>
diff --git a/assets/themes/twitter/css/style.css b/assets/themes/twitter/css/style.css
@@ -68,4 +68,8 @@ html, body {
 	border:1px solid #4C964D;
 	color:#FFF;
 }
+footer p{
+	text-align: center;
+	margin-top: 4px;
+}
 	

Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,8 @@ html, body {`
`68`	`68`	`border:1px solid #4C964D;`
`69`	`69`	`color:#FFF;`
`70`	`70`	`}`
	`71`	`+footer p{`
	`72`	`+ text-align: center;`
	`73`	`+ margin-top: 4px;`
	`74`	`+}`
`71`	`75`