From 62eb8101af531a06f35602ffe906e0ee35b139f1 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 12 Oct 2010 12:06:35 -0700
Subject: [PATCH] Updating CSS for new theme again.

--HG--
branch : dev
---
 .../Themes/TheThemeMachine/Styles/site.css    | 114 +++++++++---------
 .../TheThemeMachine/Views/Layout.cshtml       |  35 +-----
 2 files changed, 61 insertions(+), 88 deletions(-)

diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
index 8b9736d68..5a9db4e4b 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css
@@ -78,7 +78,7 @@ body {
   font-size: 62.5%;
   color: #333; 
   background: #fff;
-  font-family: Segoe UI,Trebuchet,Arial,Sans-Serif;
+  font-family: Tahoma, "Helvetica Neue", Arial, Helvetica, sans-serif;
 }
 
 a {}
@@ -90,7 +90,7 @@ a:visited{}
 
 h1,h2,h3,h4,h5,h6 { font-weight: normal; }
 
-h1 { font-size: 3em;}
+h1 { font-size: 3em; }
 h2 { font-size: 1.3em; }
 h3 { font-size: 1.2em; }
 h4 { font-size: 1.1em; }
@@ -102,7 +102,9 @@ h4 img, h5 img, h6 img {
   margin: 0;
 }
 
-p, .meta {
+article header h1 { font-size: 2em; }
+
+p, aside, footer, .meta {
 	font-size:1.3em;
 	line-height:2em;
 }
@@ -115,68 +117,31 @@ p, .meta {
 }
 
 #layout-header {
-    border:1px solid #ff0000;
     background: #53a4ca;
+    padding: 24px 0;
+    margin-bottom:12px;
 }
 
 #branding a {
     color:#fff;
     text-decoration:none;
-    padding:48px 12px;
+    padding:0 12px;
 }
 
-
 #layout-wrapper {
-	border:1px solid #CCC;
 }
 
-/* Sidebar off - Content Zone 960 */
-#content {
-    /*clear:both;
-    padding:12px;*/
-}
-
-/*One Sidebar on */
-.has-sidebar #content {
-	background-color:#e8e8e8;
-	width: 600px;
-    /*padding:12px 6px 6px 12px;*/
-	float:left;
-    /*clear:both;*/
-}
-
-.has-sidebar .sidebar {
-    background-color:#f6f6f6;
-    width: 360px;
-	float:right;
-}
-
-/*Two Sidebars on */
-.has-sidebars #content {
-	background-color:#e8e8e8;
-	width: 600px;
-}
-
-.has-sidebars .sidebar {
-    background-color:#f6f6f6;
-    width: 180px;
-}
-
-.has-sidebars .primary, .has-sidebars .secondary, .has-sidebars #content {
-    float:left;
-}
-
-#sitemap {
-    clear:both;
+#layout-footer {
+    border-top: 1px solid #999;
+    margin-top:12px;
 }
 
        
 /* Navigation */
 
-
 #navigation {
     width: 960px;
-	margin: 4px auto;
+	margin: 12px auto;
 	display:block;
     border-bottom: 1px solid #999;
 }
@@ -188,13 +153,13 @@ nav ul {
 nav ul li
  {
 	border:1px solid #999;
-	background:#e7e7e7;
+	background:#f6f6f6;
 	display:block;
 	float:left;
 	margin:0 2px -1px 0;
 }
 
-nav ul li.on {
+nav ul li.current {
 	border-bottom: 1px solid #fff;
 	background:#fff;
 }
@@ -208,11 +173,49 @@ nav ul a {
     line-height:24px;
 }
 
-#footer {}
-
 /* Main
 ***************************************************************/
 
+/* Sidebar off - Content Zone 960 */
+#content, .sidebar {
+    padding:6px;
+}
+
+/* One Sidebar on */
+.has-sidebar #content {
+	width: 588px;
+	float:left;
+}
+
+.has-sidebar .sidebar {
+    width: 348px;
+	float:right;
+}
+
+/* Sidebar on the left */
+.has-sidebar-left #content {
+	width: 588px;
+	float:right;
+}
+
+.has-sidebar-left .secondary {
+    width: 348px;
+	float:left;
+}
+
+/* Two Sidebars on */
+.has-sidebars #content {
+	width: 588px;
+}
+
+.has-sidebars .sidebar {
+    width: 168px;
+}
+
+.has-sidebars .primary, .has-sidebars .secondary, .has-sidebars #content {
+    float:left;
+}
+
 /* Secondary
 ***************************************************************/
 
@@ -268,13 +271,8 @@ form.inline p { margin-bottom:0; }
 ***************************************************************/
 
 /* For testing purposes */
-
-
-
-
-
-.zone {
-    /*padding:6px;*/
+.user-display {
+    display:inline;
 }
 
 
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
index 5809234a2..20f266501 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml
@@ -1,4 +1,5 @@
 @{
+
     Style.Include("site.css");
 
     // cool stuff goes up here
@@ -7,8 +8,7 @@
     // Zone is an alias for Display
     Func<dynamic, dynamic> Zone = x => Display(x);
 
-
-
+    //Add classes to the wrapper div to toggle zones on and off 
     if (Model.Sidebar != null && Model.Sidebar2 == null) {
         Model.Classes.Add("has-sidebar");
     }
@@ -22,7 +22,6 @@
 
     }
 
-
     //Model.Attributes.Add("onclick", "javscript:alert('woot')"); 
 
     Model.Id = "layout-wrapper";
@@ -63,28 +62,6 @@
     </div>
     }
 
- @* This code would inject text into the Featured zone.
-    @{WorkContext.Layout.Featured.Add("just some text in featured");}
-*@
-
-  @{
-  WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
-  }
-  @if(Model.Featured != null) {
-     <div class="zone-featured group">
-        @Zone(Model.Featured)
-    </div>
-    }
-
-  @{
-  WorkContext.Layout.Recent.Add(New.Recent());
-  }
-  @if(Model.Featured != null) {
-    <div class="group">
-        @Zone(Model.Recent)
-    </div>
-    }
-
     @if(Model.Sidebar2 != null) {
     <aside class="sidebar secondary">
         @Zone(Model.Sidebar2)
@@ -107,17 +84,15 @@
 
 </div>
 
-  @{
-  WorkContext.Layout.Footer.Add(@Display.User());
-  }
+
     @if(Model.Footer != null) {
     <footer id="layout-footer" class="group">
         @Zone(Model.Footer)
     </footer>
     }
     else {
-    <footer id="layout-footer">
-    Powered by Orchard @Display.User()
+    <footer id="layout-footer" class="group">
+    Powered by Orchard &#169; The Theme Machine 2010. @Display.User()
     </footer>
 }