From b0ebcbb93c27ed4d0420df3f4f191ec35085019d Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 20 Jun 2012 09:50:00 +0200
Subject: [PATCH] Minor progress

---
 wp-content/themes/tn-2012/front-page.php      | 36 ++++++++---------
 wp-content/themes/tn-2012/header.php          |  2 +-
 wp-content/themes/tn-2012/sass/screen.scss    | 40 +++++++++++++++----
 .../themes/tn-2012/stylesheets/screen.css     | 39 +++++++++++++++++-
 4 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/wp-content/themes/tn-2012/front-page.php b/wp-content/themes/tn-2012/front-page.php
index b7c188e..9d8b3b4 100644
--- a/wp-content/themes/tn-2012/front-page.php
+++ b/wp-content/themes/tn-2012/front-page.php
@@ -1,34 +1,32 @@
 
 <?php get_header(); ?>
 
-		<div id="container">
-			<div id="content">
+  <div id="content">
 
-			<?php if ( have_posts() ) : ?>
+  <?php if ( have_posts() ) : ?>
 
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+    <?php /* Start the Loop */ ?>
+    <?php while ( have_posts() ) : the_post(); ?>
 
-					<?php // todo content
-                                        the_content(); ?>
+      <?php // todo content
+      the_content(); ?>
 
-				<?php endwhile; ?>
+    <?php endwhile; ?>
 
-				<?php // todo footer ?>
+    <?php // todo footer ?>
 
-			<?php else : ?>
+  <?php else : ?>
 
-				<article id="post-0" class="post no-results not-found">
-					<header class="entry-header">
-                                                Nothing.
-					</header><!-- .entry-header -->
+    <article id="post-0" class="post no-results not-found">
+      <header class="entry-header">
+                                            Nothing.
+      </header><!-- .entry-header -->
 
-					</div><!-- .entry-content -->
-				</article><!-- #post-0 -->
+      </div><!-- .entry-content -->
+    </article><!-- #post-0 -->
 
-			<?php endif; ?>
+  <?php endif; ?>
 
-			</div><!-- #content -->
-		</div><!-- #primary -->
+  </div><!-- #content -->
 
 <?php get_footer(); ?>
diff --git a/wp-content/themes/tn-2012/header.php b/wp-content/themes/tn-2012/header.php
index f1e728d..1a0da9e 100644
--- a/wp-content/themes/tn-2012/header.php
+++ b/wp-content/themes/tn-2012/header.php
@@ -46,7 +46,7 @@
 	<header id="branding" role="banner">
 			<div class="hgroup">
                 <a href="<?php bloginfo('url'); ?>"></a>
-				<div id="site-title"><div class="head"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><img src="<?php bloginfo('stylesheet_directory'); ?>/img/teater_neuf.jpg"><span><?php bloginfo( 'name' ); ?></span></a></div></div>
+				<div id="site-title"><div class="head"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><img src="<?php bloginfo('stylesheet_directory'); ?>/img/teater_neuf.jpg"></a></div></div>
 			</div>
 
 			<nav id="access" role="navigation">
diff --git a/wp-content/themes/tn-2012/sass/screen.scss b/wp-content/themes/tn-2012/sass/screen.scss
index fc7ef77..87eb360 100644
--- a/wp-content/themes/tn-2012/sass/screen.scss
+++ b/wp-content/themes/tn-2012/sass/screen.scss
@@ -5,21 +5,45 @@
 
 @import "compass/reset";
 @import "compass/utilities/general/clearfix";
+@import "compass/typography/lists/inline-block-list";
 @import "960/grid";
 
+$main-color: #7650b3;
+
 /*$ninesixty-columns (default: 12) controls the default number of grid columns
 $ninesixty-grid-width (default: 960px) controls the default overall grid width
 $ninesixty-gutter-width */
+$ninesixty-grid-width: 1200px; 
 body {
-    
-    #container {
-        @include grid_container;
-        @include clearfix;
+  font-size: 16px;
 
-        #content{
-            @include grid(12);
-            @include clearfix;
+  #container {
+    @include grid_container;
+    @include clearfix;
 
+    #branding {
+      background: $main-color;
+      height: 200px;
+      /* TODO you are here... move menu right. */
+      
+      nav#access {
+        a {
+          color: #ffffff;
         }
-    } 
+        ul {
+          @include inline-block-list;
+          
+          li {
+            margin: 4px;
+          }
+        }
+      }
+    }
+
+    #content{
+      @include grid(12);
+      @include clearfix;
+
+    }
+  } 
 }
diff --git a/wp-content/themes/tn-2012/stylesheets/screen.css b/wp-content/themes/tn-2012/stylesheets/screen.css
index 577789d..fac40b2 100644
--- a/wp-content/themes/tn-2012/stylesheets/screen.css
+++ b/wp-content/themes/tn-2012/stylesheets/screen.css
@@ -61,19 +61,54 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 /*$ninesixty-columns (default: 12) controls the default number of grid columns
 $ninesixty-grid-width (default: 960px) controls the default overall grid width
 $ninesixty-gutter-width */
+body {
+  font-size: 16px;
+}
 body #container {
   margin-left: auto;
   margin-right: auto;
-  width: 960px;
+  width: 1200px;
   overflow: hidden;
   *zoom: 1;
 }
+body #container #branding {
+  background: #7650b3;
+  height: 200px;
+  /* TODO you are here... move menu right. */
+}
+body #container #branding nav#access a {
+  color: #ffffff;
+}
+body #container #branding nav#access ul {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  overflow: hidden;
+  *zoom: 1;
+}
+body #container #branding nav#access ul li {
+  list-style-image: none;
+  list-style-type: none;
+  margin-left: 0;
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: middle;
+  *vertical-align: auto;
+  white-space: nowrap;
+}
+body #container #branding nav#access ul li {
+  *display: inline;
+}
+body #container #branding nav#access ul li {
+  margin: 4px;
+}
 body #container #content {
   display: inline;
   float: left;
   margin-left: 10px;
   margin-right: 10px;
-  width: 940px;
+  width: 1180px;
   overflow: hidden;
   *zoom: 1;
 }