From 7b939119c99576a9525ff933958eb9d322fa3195 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Thu, 21 Feb 2013 22:50:07 -0800
Subject: More logically set up the top-bar. Switching this to a Fixed header
 is now a 2 line change.

---
 css/page.css        | 34 ++++++++++++++++++++++------------
 includes/header.php |  4 ++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/css/page.css b/css/page.css
index ad45e8b..2f4af87 100644
--- a/css/page.css
+++ b/css/page.css
@@ -255,10 +255,6 @@ position:absolute;color:#333;left:25px;bottom:20px;
 
 
 
-.topbarSpacer {
-	width:900px;
-	height:70px;
-}
 .wrapper {
 	width: 900px;
 	margin: 0 auto;
@@ -283,12 +279,18 @@ position:absolute;color:#333;left:25px;bottom:20px;
 	float:right;
 }
 
+.topbarSpacer {
+	width:900px;
+	height:0px;
+}
 #topbar {
 	font-weight:bold;
-	padding: 15px 15px;
-	margin: 0 auto 40px;
-	text-align: center;
+	padding: 15px 0px 15px 0px;
+	padding: 0px;
+	height:50px
+	text-align:center;
 	position: fixed; /* for #user */
+	position: relative;
 	min-width: 900px;
 	width:100%;
 	background: -moz-linear-gradient(top, #555, #222);
@@ -300,22 +302,30 @@ position:absolute;color:#333;left:25px;bottom:20px;
   -khtml-opacity: 0.9;
   opacity: 0.9;
 }
-#topbar a.nav {
+#topbarContent {
+	margin: 0 auto;
+	position: relative;
+	text-align: center;
+	width:900px;
+	height:100%;
+}
+#topbarContent a.nav {
 	background-color: #222;
-	margin-right: 15px;
+	display: inline-block;
+	margin: 7px;
 	padding: 7px 10px;
 	border-radius: 5px;
 	text-decoration: none;
 	border: 1px solid #333;
 	box-shadow: 0 0 1px #444;
 }
-#topbar a.nav.selected, #topbar a.nav:hover {
+#topbarContent a.nav.selected, #topbarContent a.nav:hover {
 	border: 1px solid #222;
 	background-color: #2c2c2c;
 }
-#topbar #user {
+#topbarContent #user {
 	position: absolute;
-	right: 45px;
+	right: 10px;
 	top: 5px;
 	text-align: right;
 }
diff --git a/includes/header.php b/includes/header.php
index c18ae2e..7d9c02d 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -155,7 +155,7 @@ function htmlFooter() {
 
 function topbar($links) {
 	global $accepted, $wallColor, $wallEmblem, $request;
-	echo '<div id="topbar">';
+	echo '<div id="topbar"><div id="topbarContent">';
 
 	foreach ($links as $key => $value) {
 		if ($request == $key) {
@@ -199,7 +199,7 @@ function topbar($links) {
 <?
 	}
 	echo "	</div>";
-	echo "</div><div class='topbarSpacer'></div>"; //div id='user'
+	echo "</div></div><div class='topbarSpacer'></div>"; //div id='user'
 }
 
 function userDataToJS() {
-- 
cgit v1.2.3