From ee0d64b543df2eeaf0f18776b11d4c6710769e6d Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sat, 6 Apr 2013 20:03:36 +0200
Subject: [PATCH] Minor

---
 wp-content/themes/gf2013/footer.php          | 21 --------------------
 wp-content/themes/gf2013/front-page.php      |  1 +
 wp-content/themes/gf2013/sass/app.scss       |  1 +
 wp-content/themes/gf2013/sidebar.php         | 20 +++++++++++++++++++
 wp-content/themes/gf2013/stylesheets/app.css |  1 +
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/wp-content/themes/gf2013/footer.php b/wp-content/themes/gf2013/footer.php
index a47ae60..b58721c 100644
--- a/wp-content/themes/gf2013/footer.php
+++ b/wp-content/themes/gf2013/footer.php
@@ -4,27 +4,6 @@
  *
  */
 ?>
-        </div><!-- #main .wrapper -->
-    </div><!-- #page -->
-    <div id="nav-wrapper" class="large-3 columns">
-        <div class="date-mark">
-            <img src="<?php echo get_template_directory_uri(); ?>/images/leaf_left.png" />
-            <div class="date">
-                <h2>5.10.2013</h2>
-            </div>
-            <div class="name">
-               <h3>Gamle Logen</h3>
-            </div>
-            <div class="time">
-                <h2>16.00</h2>
-            </div>
-            <img src="<?php echo get_template_directory_uri(); ?>/images/leaf_right.png" />
-        </div>
-        <nav id="site-navigation" class="main-navigation" role="navigation">
-            <?php wp_nav_menu( array( 'theme_location' => 'primary-menu', 'menu_class' => 'nav-menu' ) ); ?>
-        </nav><!-- #site-navigation -->
-    </div>
-
     <footer id="colophon" class="row">
         <div class="site-info small-9 text-center columns">
             <a href="http://uio.no"><img src="<?php echo get_template_directory_uri(); ?>/images/logo_uio.png" /></a>
diff --git a/wp-content/themes/gf2013/front-page.php b/wp-content/themes/gf2013/front-page.php
index f2426b6..825395a 100644
--- a/wp-content/themes/gf2013/front-page.php
+++ b/wp-content/themes/gf2013/front-page.php
@@ -18,5 +18,6 @@ get_header();
         </div><!-- #content -->
     </div><!-- #primary -->
 <?
+get_sidebar();
 get_footer();
 ?>
diff --git a/wp-content/themes/gf2013/sass/app.scss b/wp-content/themes/gf2013/sass/app.scss
index 73f304f..69eb778 100644
--- a/wp-content/themes/gf2013/sass/app.scss
+++ b/wp-content/themes/gf2013/sass/app.scss
@@ -197,6 +197,7 @@ body,html {
             
             h2 {
                 margin-bottom: 0;
+                letter-spacing: 0;
             }
         }
 
diff --git a/wp-content/themes/gf2013/sidebar.php b/wp-content/themes/gf2013/sidebar.php
index e69de29..83c8731 100644
--- a/wp-content/themes/gf2013/sidebar.php
+++ b/wp-content/themes/gf2013/sidebar.php
@@ -0,0 +1,20 @@
+        </div><!-- #main .wrapper -->
+    </div><!-- #page -->
+    <div id="nav-wrapper" class="large-3 columns">
+        <div class="date-mark">
+            <img src="<?php echo get_template_directory_uri(); ?>/images/leaf_left.png" />
+            <div class="date">
+                <h2>5.10.2013</h2>
+            </div>
+            <div class="name">
+               <h3>Gamle Logen</h3>
+            </div>
+            <div class="time">
+                <h2>kl 18.00</h2>
+            </div>
+            <img src="<?php echo get_template_directory_uri(); ?>/images/leaf_right.png" />
+        </div>
+        <nav id="site-navigation" class="main-navigation" role="navigation">
+            <?php wp_nav_menu( array( 'theme_location' => 'primary-menu', 'menu_class' => 'nav-menu' ) ); ?>
+        </nav><!-- #site-navigation -->
+    </div>
diff --git a/wp-content/themes/gf2013/stylesheets/app.css b/wp-content/themes/gf2013/stylesheets/app.css
index 51177ad..cafcdcb 100644
--- a/wp-content/themes/gf2013/stylesheets/app.css
+++ b/wp-content/themes/gf2013/stylesheets/app.css
@@ -4831,6 +4831,7 @@ html blockquote p {
 }
 #nav-wrapper .date-mark .time h2 {
   margin-bottom: 0;
+  letter-spacing: 0;
 }
 #nav-wrapper #site-navigation {
   margin: 2em auto;