From f6da39b493d93126d18d9c3a0003b4b6f8d68b13 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sat, 6 Apr 2013 19:19:16 +0200
Subject: [PATCH] Fixes

---
 wp-content/themes/gf2013/footer.php          | 13 +++++++------
 wp-content/themes/gf2013/sass/app.scss       | 14 ++++++++++++--
 wp-content/themes/gf2013/stylesheets/app.css | 12 ++++++++++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/wp-content/themes/gf2013/footer.php b/wp-content/themes/gf2013/footer.php
index d52e908..1b6fbf5 100644
--- a/wp-content/themes/gf2013/footer.php
+++ b/wp-content/themes/gf2013/footer.php
@@ -24,13 +24,14 @@
             <?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 large-9 text-center columns">
+            <a href="http://uio.no"><img src="<?php echo get_template_directory_uri(); ?>/images/logo_uio.png" /></a>
+            <a href="http://akademika.no"><img src="<?php echo get_template_directory_uri(); ?>/images/logo_akademika.png" /></a>
+        </div>
+    </footer>
 </div>
-<footer id="colophon" class="row">
-    <div class="site-info large-9 text-center columns">
-        <a href="http://uio.no"><img src="<?php echo get_template_directory_uri(); ?>/images/logo_uio.png" /></a>
-        <a href="http://akademika.no"><img src="<?php echo get_template_directory_uri(); ?>/images/logo_akademika.png" /></a>
-    </div>
-</footer>
 
 
 <script src="<?php echo get_template_directory_uri(); ?>/javascripts/foundation/foundation.js"></script>
diff --git a/wp-content/themes/gf2013/sass/app.scss b/wp-content/themes/gf2013/sass/app.scss
index 92505b2..3d15fc1 100644
--- a/wp-content/themes/gf2013/sass/app.scss
+++ b/wp-content/themes/gf2013/sass/app.scss
@@ -77,6 +77,13 @@ body,html {
     h2 {
         font-family: inherit;
     }
+    p {
+        margin-bottom: 1em;
+    }
+
+    blockquote {
+        color: #f4d3b4;
+    }
 }
 .page-wrapper {
     height: 100%;
@@ -118,6 +125,7 @@ body,html {
         &.background-5 {
             background-image: url("../images/bg-5.jpg");
         }
+
         background-image: url("../images/bg-0.jpg");
         background-repeat: no-repeat;
         min-height: 694px;
@@ -131,7 +139,7 @@ body,html {
 
                 .entry-title {
                     background-color: $grey;
-                    padding-top: 1em;
+                    padding-top: 0.8em;
                     padding-bottom: 0.8em;
                     margin-bottom: 0;
                     margin-top: 0;
@@ -142,7 +150,7 @@ body,html {
                     }
                 }
                 .page-links {
-                    padding-bottom: 20px;
+                    padding-bottom: 10px;
                 }
             }
         }
@@ -152,6 +160,7 @@ body,html {
 #nav-wrapper {
     width: 300px;
     height: 100%;
+    max-height: 806px;
     background-color: $grey;
     @include border-radius(2px);
     text-align: center;
@@ -243,6 +252,7 @@ body,html {
 /* Footer */
 #colophon {
     img {
+        margin-top: 10px;
         margin-right: 20px;
     }
 }
diff --git a/wp-content/themes/gf2013/stylesheets/app.css b/wp-content/themes/gf2013/stylesheets/app.css
index 4bc3531..ab47850 100644
--- a/wp-content/themes/gf2013/stylesheets/app.css
+++ b/wp-content/themes/gf2013/stylesheets/app.css
@@ -4713,6 +4713,12 @@ body h1, html h1 {
 body h2, html h2 {
   font-family: inherit;
 }
+body p, html p {
+  margin-bottom: 1em;
+}
+body blockquote, html blockquote {
+  color: #f4d3b4;
+}
 
 .page-wrapper {
   height: 100%;
@@ -4768,7 +4774,7 @@ body h2, html h2 {
 }
 #page #content .page .entry-wrap .entry-title {
   background-color: #2d2b29;
-  padding-top: 1em;
+  padding-top: 0.8em;
   padding-bottom: 0.8em;
   margin-bottom: 0;
   margin-top: 0;
@@ -4777,13 +4783,14 @@ body h2, html h2 {
   padding-left: 20px;
 }
 #page #content .page .entry-wrap .page-links {
-  padding-bottom: 20px;
+  padding-bottom: 10px;
 }
 
 /* Navigation sidebar */
 #nav-wrapper {
   width: 300px;
   height: 100%;
+  max-height: 806px;
   background-color: #2d2b29;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -4868,6 +4875,7 @@ body h2, html h2 {
 
 /* Footer */
 #colophon img {
+  margin-top: 10px;
   margin-right: 20px;
 }