From 8403f0487da8741524f1c4998a3ca087aca71130 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Mon, 6 May 2013 23:11:07 +0200
Subject: [PATCH] Minor

---
 wp-content/themes/studio13/css/app.css    |  4 +++-
 wp-content/themes/studio13/footer.php     |  1 +
 wp-content/themes/studio13/front-page.php |  1 -
 wp-content/themes/studio13/sass/app.scss  | 20 +++++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/wp-content/themes/studio13/css/app.css b/wp-content/themes/studio13/css/app.css
index 6b4187f..c4bf655 100644
--- a/wp-content/themes/studio13/css/app.css
+++ b/wp-content/themes/studio13/css/app.css
@@ -548,6 +548,7 @@ header.header .nav-menu a:hover { background-color: #ff005c; }
 .separator { height: 2px; background-color: #ff005c; margin: 2em 0; }
 .separator.tiny-margin { margin-top: 0; margin-bottom: 0.4em; }
 
+article { margin-bottom: 1em; }
 article .article-header h1 a { color: inherit; }
 article .article-header h1 a:hover { color: #007aff; }
 article .article-header h4 a { color: #ff005c; }
@@ -579,6 +580,7 @@ article .article-footer { text-align: right; margin-bottom: 2em; }
 .flying-megawhale { width: 719px; height: 582px; background-image: url("../images/megawhale.png"); background-size: 100% 100%; background-repeat: no-repeat; margin: auto; margin-top: 4em; position: relative; top: 50px; z-index: -1; }
 
 .wave { position: fixed; left: 0px; bottom: 0px; height: 30px; width: 100%; background-color: #007aff; }
-.wave .wavetop { position: relative; bottom: 12px; height: 12px; background-image: url("../images/wave_top.png"); background-size: 48px 12px; background-repeat: repeat-x; width: 100%; }
+
+.wavetop { position: relative; bottom: 12px; height: 12px; background-image: url("../images/wave_top.png"); background-size: 48px 12px; background-repeat: repeat-x; width: 100%; }
 
 .row { /* FIXME: responsive */ width: 1000px; max-width: 1000px; }
diff --git a/wp-content/themes/studio13/footer.php b/wp-content/themes/studio13/footer.php
index 6c5f132..b974245 100755
--- a/wp-content/themes/studio13/footer.php
+++ b/wp-content/themes/studio13/footer.php
@@ -1,6 +1,7 @@
         <div class="wave"><div class="wavetop"></div></div>
         <div class="flying-megawhale"></div>
         <footer class="footer" role="contentinfo">
+            <div class="wavetop"></div>
             <div id="inner-footer">
                 <a href="http://studentersamfundet.no/"><img src="<?php echo get_template_directory_uri(); ?>/images/streamer.png" /></a>
                 <!--<nav role="navigation">
diff --git a/wp-content/themes/studio13/front-page.php b/wp-content/themes/studio13/front-page.php
index 42e87d1..25043ae 100644
--- a/wp-content/themes/studio13/front-page.php
+++ b/wp-content/themes/studio13/front-page.php
@@ -23,7 +23,6 @@
                 <?php if (is_sticky($post->ID)): ?>
                     <?php get_template_part( 'content', 'sticky' ); ?>
                 <?php else:  ?>
-                <!-- FIXME:  -->
                     <?php get_template_part( 'content' ); ?>
                 <?php endif; ?>
             <?php endwhile; ?>
diff --git a/wp-content/themes/studio13/sass/app.scss b/wp-content/themes/studio13/sass/app.scss
index f7ffcac..f8c3c56 100644
--- a/wp-content/themes/studio13/sass/app.scss
+++ b/wp-content/themes/studio13/sass/app.scss
@@ -177,6 +177,8 @@ header.header {
     }
 }
 article {
+    margin-bottom: 1em;
+
     .article-header {
         h1 a {
             color: inherit;
@@ -288,15 +290,15 @@ article {
     width:100%;
     background-color: $primary-color;
 
-    .wavetop {
-        position: relative;
-        bottom: 12px;
-        height: 12px;
-        background-image: url("../images/wave_top.png");
-        background-size: 48px 12px;
-        background-repeat: repeat-x;
-        width:100%;
-    }
+}
+.wavetop {
+    position: relative;
+    bottom: 12px;
+    height: 12px;
+    background-image: url("../images/wave_top.png");
+    background-size: 48px 12px;
+    background-repeat: repeat-x;
+    width:100%;
 }
 .row {
     /* FIXME: responsive */