From 68fd48fcfce854126d00870e687a8beee448bcfe Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 25 Jul 2012 22:25:52 +0200
Subject: [PATCH] Style updates: logo and news

---
 wp-content/themes/tn-2012/footer.php          |  6 ++----
 wp-content/themes/tn-2012/index.php           | 13 ++++++------
 wp-content/themes/tn-2012/sass/screen.scss    | 19 +++++++++++++++--
 .../themes/tn-2012/stylesheets/screen.css     | 21 +++++++++++++++++--
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/wp-content/themes/tn-2012/footer.php b/wp-content/themes/tn-2012/footer.php
index f2ee981..4fa43fa 100755
--- a/wp-content/themes/tn-2012/footer.php
+++ b/wp-content/themes/tn-2012/footer.php
@@ -2,10 +2,8 @@
 <footer id="site-footer">
 	<div id="footer-container">
         <div id="footer-about" class="grid_4 alpha">
-            <h2>Teater Neuf</h2>
-            <p>
-                Studentteateret i Oslo er Norges største og eldste studentteater og Studentersamfundets største forening. Vi holder til på Chateau Neuf hvor vi har vår egen scene, Teaterscenen, og driver teater fra dag til dag. Vi er et prosjektbasert teater, noe som vil si at vi ikke har en fast gruppe skuespillere, regissører, scenografer o.l., men er åpne for hvem som helst å komme med prosjektbeskrivelser til nye forestillinger eller undergrupper av teateret. 
-            </p>
+            <h2><a href="om-oss/" class="black">Teater Neuf</a></h2>
+            <p>Studentteateret i Oslo er Norges største og eldste studentteater og Studentersamfundets største forening. Vi holder til på Chateau Neuf hvor vi har vår egen scene, Teaterscenen, og driver teater fra dag til dag. </p>
         </div> <!-- #footer-about -->
     </div>
 
diff --git a/wp-content/themes/tn-2012/index.php b/wp-content/themes/tn-2012/index.php
index 191ce22..b311eb8 100755
--- a/wp-content/themes/tn-2012/index.php
+++ b/wp-content/themes/tn-2012/index.php
@@ -1,26 +1,27 @@
 <?php get_header(); ?>
 
-		<div id="content" class="container_12">
+		<div id="content">
 
-			<h1 class="page-title grid_12"><?php neuf_page_title(); ?></h1>
+			<h1 class="page-title grid_12"><?php wp_title("", true); ?></h1>
 
 		<?php if( have_posts() ) : while( have_posts() ) : the_post(); ?>
 			
 			<article <?php neuf_post_class(); ?>>
 
-				<div class="body grid_6">
+				<div class="text-body">
 
 					<h3 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
+					<div class="entry-meta byline"><span class="meta-prep meta-prep-author">av </span><span class="author vcard"><?php the_author_link(); ?></span>, <span class="entry-date"><?php the_date('l d. M Y'); ?> kl <?php the_time('G.i'); ?></span></div>
 
 					<div class="entry-content"><?php the_excerpt(); ?></div> <!-- .entry-content -->
 
-				</div> <!-- .grid_6 -->
+				</div>
 
-				<div class="featured-image grid_6">
+				<div class="featured-image">
 
 					<?php the_post_thumbnail( 'six-column-slim' , array( 'style' => 'display:block;margin:auto;' ) ); ?>
 
-				</div> <!-- .grid_6 -->
+				</div>
 
 			</article> <!-- .post -->
 
diff --git a/wp-content/themes/tn-2012/sass/screen.scss b/wp-content/themes/tn-2012/sass/screen.scss
index 5f4e96d..d68b1e1 100644
--- a/wp-content/themes/tn-2012/sass/screen.scss
+++ b/wp-content/themes/tn-2012/sass/screen.scss
@@ -80,9 +80,9 @@ body {
                 @include grid(6);
 
                 .logo {
-                    background: url('../img/teater_neuf.jpg') no-repeat;
+                    background: url('../img/teater_neuf_logo.png') no-repeat;
                     display: inline-block;
-                    width: 340px;
+                    width: 185px;
                     height: 120px;
                     margin-top: 10px;
                     text-indent: -9999px;
@@ -374,6 +374,16 @@ body {
             }
 
         }
+		.text-body {
+			@include grid(6);
+			@include alpha();
+			margin-bottom: 20px;
+
+		}
+		.post {
+			@include clearfix();
+
+		}
     }
     #site-footer {
         background-color: $main-color;
@@ -405,6 +415,11 @@ body {
 
             #footer-about {
                 @include grid(5);
+
+				a.black {
+					color: #000;
+					@include single-text-shadow(lighten($main-color, 10%), 1px, 1px, 0);
+				}
             }
         }
         #kolofon {
diff --git a/wp-content/themes/tn-2012/stylesheets/screen.css b/wp-content/themes/tn-2012/stylesheets/screen.css
index 2409790..afd9a68 100644
--- a/wp-content/themes/tn-2012/stylesheets/screen.css
+++ b/wp-content/themes/tn-2012/stylesheets/screen.css
@@ -134,9 +134,9 @@ body #site-header #header-container .site-title {
   width: 580px;
 }
 body #site-header #header-container .site-title .logo {
-  background: url("../img/teater_neuf.jpg") no-repeat;
+  background: url("../img/teater_neuf_logo.png") no-repeat;
   display: inline-block;
-  width: 340px;
+  width: 185px;
   height: 120px;
   margin-top: 10px;
   text-indent: -9999px;
@@ -485,6 +485,19 @@ body #content #program-list .event .thumbnail {
   width: 580px;
   margin-right: 0;
 }
+body #content .text-body {
+  display: inline;
+  float: left;
+  margin-left: 10px;
+  margin-right: 10px;
+  width: 580px;
+  margin-left: 0;
+  margin-bottom: 20px;
+}
+body #content .post {
+  overflow: hidden;
+  *zoom: 1;
+}
 body #site-footer {
   background-color: #7650b3;
   min-width: 100%;
@@ -529,6 +542,10 @@ body #site-footer #footer-container #footer-about {
   margin-right: 10px;
   width: 480px;
 }
+body #site-footer #footer-container #footer-about a.black {
+  color: #000;
+  text-shadow: #9274c2 1px 1px 0;
+}
 body #site-footer #kolofon {
   margin-left: auto;
   margin-right: auto;