Fix officehours layout

Occupying-Mars · Oct 1, 2013 · ac47d1b · ac47d1b
1 parent a2847f6
commit ac47d1b
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 24 deletions.
diff --git a/source/layouts/officehours.erb b/source/layouts/officehours.erb
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+  <head>
+    <%= partial 'head' %>
+  </head>
+
+  <body>
+    <%= partial 'navbar' %>
+
+    <% if current_page.url == '/' %>
+      <%= partial 'intro' %>
+    <% end %>
+
+    <div class='container'>
+      <div class='row'>
+        <div class='col-md-11 col-md-offset-1'>
+          <%= yield %>
+        </div>
+      </div>
+
+      <div class='row'>
+        <div class='col-md-10 col-md-offset-1'>
+          <%= partial 'footer' %>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/source/officehours/2013-01-22.html.erb b/source/officehours/2013-01-22.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - January 22, 2013
+layout: officehours
 ---
 
 <h1>

diff --git a/source/officehours/2013-02-26.html.erb b/source/officehours/2013-02-26.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - February 26, 2013
+layout: officehours
 ---
 
 <h1>

diff --git a/source/officehours/2013-03-19.html.erb b/source/officehours/2013-03-19.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - March 19, 2013
+layout: officehours
 ---
 
 <h1>

diff --git a/source/officehours/2013-05-21.html.erb b/source/officehours/2013-05-21.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - May 21, 2013
+layout: officehours
 ---
 
 <h1>

diff --git a/source/officehours/2013-08-06.html.erb b/source/officehours/2013-08-06.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - August 6, 2013
+layout: officehours
 ---
 
 <h1>Tent Office Hours - August 6, 2013</h1>

diff --git a/source/officehours/2013-10-01.html.erb b/source/officehours/2013-10-01.html.erb
@@ -1,5 +1,6 @@
 ---
 title: Office Hours - October 1, 2013
+layout: officehours
 ---
 
 <h1>Tent Office Hours - October 1, 2013</h1>

diff --git a/source/officehours/index.html.erb b/source/officehours/index.html.erb
@@ -1,30 +1,32 @@
 ---
 title: Office Hours
-layout: blog_layout
+layout: officehours
 ---
 
-<iframe src="https://www.ustream.tv/embed/13161332?autoplay=true" width="640" height="386" scrolling="no" frameborder="0" style="border: 0px none transparent;"></iframe>
-<iframe src="https://webchat.freenode.net?randomnick=1&channels=tent" style="border: 0px none transparent" width="640" height="400"></iframe>
+<iframe src="https://www.ustream.tv/embed/13161332?autoplay=true" class="col-md-11" height="386" scrolling="no" frameborder="0" style="border: 0px none transparent;"></iframe>
+<iframe src="https://webchat.freenode.net?randomnick=1&channels=tent" class="col-md-11" style="border: 0px none transparent" height="400"></iframe>
 
-<h3>Previous Office Hours</h3>
+<div class='col-md-11'>
+  <h3>Previous Office Hours</h3>
 
-<ul>
-  <li>
-    <a href="/officehours/2013-10-01">October 1, 2013</a>
-  </li>
-  <li>
-    <a href="/officehours/2013-08-06">August 6, 2013</a>
-  </li>
-  <li>
-    <a href="/officehours/2013-05-21">May 21, 2013</a>
-  </li>
-  <li>
-    <a href="/officehours/2013-03-19">March 19, 2013</a>
-  </li>
-  <li>
-    <a href="/officehours/2013-02-26">February 26, 2013</a>
-  </li>
-  <li>
-    <a href="/officehours/2013-01-22">January 22, 2013</a>
-  </li>
-</ul>
+  <ul>
+    <li>
+      <a href="/officehours/2013-10-01">October 1, 2013</a>
+    </li>
+    <li>
+      <a href="/officehours/2013-08-06">August 6, 2013</a>
+    </li>
+    <li>
+      <a href="/officehours/2013-05-21">May 21, 2013</a>
+    </li>
+    <li>
+      <a href="/officehours/2013-03-19">March 19, 2013</a>
+    </li>
+    <li>
+      <a href="/officehours/2013-02-26">February 26, 2013</a>
+    </li>
+    <li>
+      <a href="/officehours/2013-01-22">January 22, 2013</a>
+    </li>
+  </ul>
+</div>