From 36c8f68ecb6ff6abb7c3f67746f62c6e99516d35 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Fri, 10 May 2013 18:48:07 +0200
Subject: [PATCH] Small fixes

---
 wp-content/themes/studio13/css/app.css    | 18 +++++------
 wp-content/themes/studio13/front-page.php |  5 +--
 wp-content/themes/studio13/header.php     |  2 +-
 wp-content/themes/studio13/sass/app.scss  | 38 +++++++++++------------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/wp-content/themes/studio13/css/app.css b/wp-content/themes/studio13/css/app.css
index 15ce1da..4285b0a 100644
--- a/wp-content/themes/studio13/css/app.css
+++ b/wp-content/themes/studio13/css/app.css
@@ -565,12 +565,12 @@ a.colored:hover img { opacity: .4; }
 .disco.reversed { -webkit-animation: disco 0.5s 0.5s infinite alternate; -moz-animation: disco 0.5s 0.5s infinite alternate; -o-animation: disco 0.5s 0.5s infinite alternate; animation: disco 0.5s 0.5s infinite alternate; }
 
 header.header { margin-top: 2em; margin-bottom: 2em; }
-header.header .date { color: #007aff; font-size: 3.44em; text-transform: uppercase; font-weight: 600; margin-bottom: 10px; display: inline-block; }
+header.header .date { color: #007aff; font-size: 3.4em; text-transform: uppercase; font-weight: 600; margin-bottom: 10px; display: inline-block; }
 header.header .logo img { position: relative; bottom: -15px; left: 10px; }
 header.header .logo img.multiply { position: absolute; left: 372px; bottom: -12px; z-index: 1; }
-header.header .nav-menu { margin: 0; padding: 0; border: 0; overflow: hidden; *zoom: 1; margin: 0 auto; background-color: #007aff; }
+header.header .nav-menu { margin: 0; padding: 0; border: 0; overflow: hidden; *zoom: 1; margin: 0 auto; }
 header.header .nav-menu li { list-style-image: none; list-style-type: none; margin-left: 0; display: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; white-space: nowrap; }
-header.header .nav-menu a { font-size: 1.5em; font-weight: 600; display: inline-block; padding: .7em .812em; color: white; text-transform: uppercase; position: relative; }
+header.header .nav-menu a { background-color: #007aff; font-size: 1.5em; font-weight: 600; display: inline-block; padding: .7em .805em; color: white; text-transform: uppercase; position: relative; }
 header.header .nav-menu a:hover { z-index: 2; background-color: #ff005c; }
 
 .highlight a { height: 280px; line-height: 1.1; font-size: 2.5em; font-weight: bold; text-transform: uppercase; text-align: center; display: block; color: white; background-color: #ff005c; }
@@ -584,20 +584,20 @@ header.header .nav-menu a:hover { z-index: 2; 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 { margin-bottom: 1.5em; }
 article p { margin-bottom: 0.6em; }
 article .article-header h1 a { color: #ff005c; background-color: white; }
 article .article-header h1 a:hover { color: #007aff; }
 article .article-header h4 a { color: #ff005c; background-color: white; }
 article .article-header h4 a:hover { color: #007aff; }
 article .entry-content { font-size: 0.9em; }
-article .article-footer { text-align: right; margin-bottom: 2em; }
+article .article-footer { text-align: right; }
 
 .moretag { font-weight: bold; }
 
 .bluebordered { border-left: 2px solid #007aff; }
 
-.row.row.tweets-and-blog { margin-bottom: 3em; }
+.row.row.tweets-and-blog { margin-top: 2em; margin-bottom: 3em; }
 
 .tweets-image { display: inline-block; width: 291px; height: 114px; background-color: white; background-image: url("../images/tweets.png"); background-repeat: no-repeat; }
 .tweets-image:hover { background-color: white; background-image: url("../images/tweets_hover.png"); }
@@ -608,15 +608,15 @@ article .article-footer { text-align: right; margin-bottom: 2em; }
 .instagram-image { display: inline-block; width: 300px; height: 304px; background-color: white; background-image: url("../images/instagram.png"); background-repeat: no-repeat; }
 .instagram-image:hover { background-color: white; background-image: url("../images/instagram_hover.png"); }
 
-.artists-image { display: inline-block; width: 300px; height: 220px; background-color: white; background-image: url("../images/artists.png"); background-repeat: no-repeat; }
-.artists-image:hover { background-color: white; background-image: url("../images/artists_hover.png"); }
-
 .social-media { font-size: 2em; color: #ff005c; }
 .social-media a { font-size: 1.5em; color: #007aff; padding: 0 0.25em; }
 .social-media a:hover { color: #ff005c; }
 .social-media .icon-twitter { margin-left: 0.25em; }
 .social-media .follow { position: relative; font-size: 0.85em; top: -8px; }
 
+.artists-image { display: inline-block; width: 300px; height: 220px; background-color: white; background-image: url("../images/artists.png"); background-repeat: no-repeat; }
+.artists-image:hover { background-color: white; background-image: url("../images/artists_hover.png"); }
+
 .sidebar .lineup ul.artists { list-style-type: none; padding-left: 0; text-transform: uppercase; font-size: 1.2em; font-weight: bold; line-height: 1.2; }
 .sidebar .lineup ul.artists a { color: #007aff; }
 .sidebar .lineup ul.artists a:hover { color: white; background-color: #ff005c; }
diff --git a/wp-content/themes/studio13/front-page.php b/wp-content/themes/studio13/front-page.php
index f033222..7045b99 100644
--- a/wp-content/themes/studio13/front-page.php
+++ b/wp-content/themes/studio13/front-page.php
@@ -39,6 +39,7 @@
                 <div class="row tweets-and-blog">
                     <div class="small-6 columns">
                         <a href="http://twitter.com/studiofestival" class="tweets-image">Tweets tagget med #studiofestivalen</a>
+                        <!-- Twitter embed -->
                         <a class="twitter-timeline" href="https://twitter.com/studiofestival" data-widget-id="332811736338022400" data-tweet-limit="1" data-border-color="#ffffff" data-chrome="nofooter transparent noheader noscrollbar noborders">Tweets by @studiofestival</a>
                         <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 
@@ -59,8 +60,8 @@
                     </div>
                 </div>
 
-                <div class="row social-media">
-                    <div class="small-12 columns"><div class="separator tiny-margin"></div>
+                <div class="row">
+                    <div class="small-12 columns"><div class="separator"></div>
                     </div>
                 </div>
                 <div class="row social-media">
diff --git a/wp-content/themes/studio13/header.php b/wp-content/themes/studio13/header.php
index af9272f..ac5d3dd 100644
--- a/wp-content/themes/studio13/header.php
+++ b/wp-content/themes/studio13/header.php
@@ -60,7 +60,7 @@
 				<div id="inner-header" class="row">
                     <div class="logo small-8 columns"><a href="<?php echo home_url(); ?>" rel="nofollow"><img src="<?php echo get_template_directory_uri(); ?>/images/logo.png" /></a><img src="<?php echo get_template_directory_uri(); ?>/images/logo_multiply.png" class="multiply" /></div>
                     <div class="small-4 columns">
-                        <span class="date">12.-24. aug</span><img src="<?php echo get_template_directory_uri(); ?>/images/line.png"></span></div>
+                        <span class="date">12.-24. aug</span><img src="<?php echo get_template_directory_uri(); ?>/images/line.png"></div>
 				</div> <!-- end #inner-header -->
                 <div class="row">
                     <nav role="navigation" class="small-12 columns">
diff --git a/wp-content/themes/studio13/sass/app.scss b/wp-content/themes/studio13/sass/app.scss
index 66863d6..2e33d15 100644
--- a/wp-content/themes/studio13/sass/app.scss
+++ b/wp-content/themes/studio13/sass/app.scss
@@ -170,7 +170,7 @@ header.header {
 
     .date {
         color: $primary-color;
-        font-size: 3.44em;
+        font-size: 3.4em;
         text-transform: uppercase;
         font-weight: 600;
         margin-bottom: 10px;
@@ -193,13 +193,13 @@ header.header {
     .nav-menu {
         @include inline-block-list;
         margin: 0 auto;
-        background-color: $primary-color;
 
         a {
+            background-color: $primary-color;
             font-size: 1.5em;
             font-weight: 600;
             display: inline-block;
-            padding: .7em .812em;
+            padding: .7em .805em;
             color: white;
             text-transform: uppercase;
             position: relative;
@@ -262,7 +262,7 @@ header.header {
     }
 }
 article {
-    margin-bottom: 1em;
+    margin-bottom: 1.5em;
 
     p {
         margin-bottom: 0.6em;
@@ -289,7 +289,6 @@ article {
     
     .article-footer {
         text-align: right;
-        margin-bottom: 2em;
     }
 }
 .moretag {
@@ -299,6 +298,7 @@ article {
     border-left: 2px solid $primary-color;
 }
 .row.row.tweets-and-blog {
+    margin-top: 2em;
     margin-bottom: 3em;
 }
 .tweets-image {
@@ -343,20 +343,6 @@ article {
         background-image: url('../images/instagram_hover.png');
     }
 }
-.artists-image {
-    @extend .hide-text;
-    display: inline-block;
-    width: 300px;
-    height: 220px;
-    background-color: white;
-    background-image: url('../images/artists.png');
-    background-repeat: no-repeat;
-
-    &:hover {
-        background-color: white;
-        background-image: url('../images/artists_hover.png');
-    }
-}
 .social-media {
     font-size: 2em;
     color: $secondary-color;
@@ -379,6 +365,20 @@ article {
         top: -8px;
     }
 }
+.artists-image {
+    @extend .hide-text;
+    display: inline-block;
+    width: 300px;
+    height: 220px;
+    background-color: white;
+    background-image: url('../images/artists.png');
+    background-repeat: no-repeat;
+
+    &:hover {
+        background-color: white;
+        background-image: url('../images/artists_hover.png');
+    }
+}
 .sidebar {
     .lineup {
         ul.artists {