restructure bootstrap grid columns

amirmc · Mar 20, 2012 · 002d722 · 002d722
1 parent 74c6c0e
commit 002d722
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 70 deletions.
diff --git a/_includes/themes/amc-twitter/default.html b/_includes/themes/amc-twitter/default.html
@@ -38,13 +38,14 @@
   <body>
     <div class="container">
       <div class="row">
+        <!-- Title -->
         <div class="span7 offset2">
           <div class="page-header">
             <h1 class="head-title"><a class="head-title" href="{{ site.production_url }}">{{ site.title }}</a> <br /></h1>
             <h3 class="head-title"><small>{{ site.tagline }}</small></h3>
           </div>
         </div>
-
+        <!-- Navigation -->
         <div class="span7 offset2">
           <ul class="head-nav">
             <li><a href="{{ site.production_url }}">home</a></li>

diff --git a/_includes/themes/amc-twitter/post.html b/_includes/themes/amc-twitter/post.html
@@ -1,52 +1,48 @@
 <div class="row">
-  <div class="span2">
-    <h5 class="post-date" align="right">{{ page.date | date_to_long_string }}</h5>
-  </div>
-  <div class="span7">
-    <!-- <div class="page-header"> -->
-      <h2><a class="post-title" href="{{ BASE_PATH }}{{ page.url }}">{{ page.title }}</a><small></small></h2>
-      <br />
-    <!-- </div> -->
-  </div>
-</div>
+  <div class="span12">
+    <div class="row">
+      <div class="span9">
 
-<div class="row">
-  <div class="span7 offset2">
-    {{ content }}
-<!--     <h4>Posted</h4>
-    <div class="date"><span>{{ page.date | date_to_long_string }}</span></div> -->
-    <hr>
-    <div class="pagination">
-      <ul>
-      {% if page.previous %}
-        <li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&larr; previous</a></li>
-      {% else %}
-        <li class="prev disabled"><a>&larr; previous</a></li>
-      {% endif %}
-        <li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">journal</a></li>
-      {% if page.next %}
-        <li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">next &rarr;</a></li>
-      {% else %}
-        <li class="next disabled"><a>next &rarr;</a>
-      {% endif %}
-      </ul>
+        <div class="row">
+          <div class="span2">
+            <h5 class="post-date" align="right">{{ page.date | date_to_long_string }}</h5>
+          </div>
+          <div class="span7">
+            <h2><a class="post-title" href="{{ BASE_PATH }}{{ page.url }}">{{ page.title }}</a><small></small></h2>
+            <br />
+            {{ content }}
+            <hr>
+            <div class="pagination">
+              <ul>
+                {% if page.previous %}
+                  <li class="prev"><a href="{{ BASE_PATH }}{{ page.previous.url }}" title="{{ page.previous.title }}">&larr; previous</a></li>
+                {% else %}
+                  <li class="prev disabled"><a>&larr; previous</a></li>
+                {% endif %}
+                  <li><a href="{{ BASE_PATH }}{{ site.JB.archive_path }}">journal</a></li>
+                {% if page.next %}
+                  <li class="next"><a href="{{ BASE_PATH }}{{ page.next.url }}" title="{{ page.next.title }}">next &rarr;</a></li>
+                {% else %}
+                  <li class="next disabled"><a>next &rarr;</a>
+                {% endif %}
+              </ul>
+            </div>
+            <hr id='comments'>
+            {% include JB/comments %}
+          </div>
+        </div>
+      </div>
+      <div class="span3">
+        <h4>Sidebar goes here</h4>
+        <br />
+        {% unless page.tags == empty %}
+        <h4>Tags</h4>
+        <ul class="tag_box">
+          {% assign tags_list = page.tags %}
+          {% include JB/tags_list %}
+        </ul>
+        {% endunless %}  
+      </div>
     </div>
-    <hr id='comments'>
-    {% include JB/comments %}
-  </div>
-
-  <div class="span2">
-    <h4>Sidebar goes here</h4>
-<!--     <div class="date">
-      <span>{{ page.date | date_to_long_string }}</span>
-    </div> -->
-    <br />
-  {% unless page.tags == empty %}
-    <h4>Tags</h4>
-    <ul class="tag_box">
-    {% assign tags_list = page.tags %}
-    {% include JB/tags_list %}
-    </ul>
-  {% endunless %}  
   </div>
-</div>
+</div>
diff --git a/index.md b/index.md
@@ -4,30 +4,36 @@ title: Amir Chaudhry
 ---
 {% include JB/setup %}
 
-{% for post in site.posts %}
+
 <div class="row">
-  <div class="span2">
-    <h5 class="post-date" align="right">{{ post.date | date_to_long_string }}</h5>
-  </div>
-  <div class="span7">
-    <h2><a class="post-title" href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></h2>
-    <br />
-    {{ post.content }}
-    <a href="{{ BASE_PATH }}{{ post.url }}#comments">Comments</a>
-    <hr>
-    <br />
-    <br />
-  </div>
-</div>
-{% endfor %}
+  <div class="span12">
+    <div class="row">
+      <div class="span9">
+
+        {% for post in site.posts %}
+        <div class="row">
+          <div class="span2">
+            <h5 class="post-date" align="right">{{ post.date | date_to_long_string }}</h5>
+          </div>
+          <div class="span7">
+            <h2><a class="post-title" href="{{ BASE_PATH }}{{ post.url }}">{{ post.title }}</a></h2>
+            <br />
+            {{ post.content }}
+            <a href="{{ BASE_PATH }}{{ post.url }}#comments">Comments</a>
+            <hr>
+            <br />
+            <br />
+          </div>
+        </div>
+        {% endfor %}
 
-<!-- <div class="row">
-  <div class="span2 offset9">
-    <h3><a href="#">Sidebar goes here</a></h3>
+      </div>
+      <div class="span3">
+        <h3><a href="#">Sidebar goes here</a></h3>
+      </div>
+    </div>
   </div>
-</div> 
-apparently not :)
--->
+</div>
 
 <div class="row">
   <div class="span7 offset2">