2 files changed, 28 insertions, 67 deletions

diff --git a/alps/alps.css b/alps/alps.css
index bb3f7bf..9261acd 100644
--- a/alps/alps.css
+++ b/alps/alps.css
@@ -98,7 +98,7 @@ body {
 	background:url("bg-main.jpg") no-repeat;
 }
 
-#header p {
+#header a {
 	float:right;
 	font-size:14px;
 	color:white;
@@ -116,11 +116,11 @@ body {
  *----------------------------------------------------------------------------------
  */
 
-#logo h1 {
+#header h1 {
 	text-indent: -999em;
 }
 
-#logo p {
+#header p.hostname {
 	color:#000;
 	position:absolute;
 	top:55px;
@@ -149,13 +149,11 @@ body {
 	
 	float: left;
 	width: 18%;
-}
 
-#nav ul {
 	display:block;
 }
 
-#nav ul li {
+#nav li {
 	list-style-type: none;
 	color:#000;
 	font-size:16px;
@@ -163,7 +161,7 @@ body {
 	margin-top: 1.2em;
 }
 
-#nav ul li ul {
+#nav li ul {
 	list-style-type: none;
 	margin-left: 1em;
 	margin-top:	10px;
@@ -171,7 +169,7 @@ body {
 	border-bottom: 1px solid #ABABAB;
 }
 
-#nav ul li ul li {
+#nav li ul li {
 	list-style-type: none;
 	font-weight:normal;
 	font-size:10px;
@@ -182,47 +180,27 @@ body {
 	letter-spacing: 0.07em;
 }
 
-#nav ul li ul li.selected {
+#nav li ul li.selected {
 	background:#CCC;
 }
 
-#nav ul li ul li a {
+#nav li ul li a {
 	display:block;	
 	padding: 1em 1em 1em 2em;
 	color: #444;
 }
 
-#nav ul li ul li a:hover {
+#nav li ul li a:hover {
 	background-color: #CCC;
 	color: #444;
 }
 
-#nav ul li ul li.selected a {
+#nav li ul li.selected a {
 	color: #444;
 	font-weight:bold;
 }
 
 /*----------------------------------------------------------------------------------
- * PAGE > MAIN > POSTNAV
- *----------------------------------------------------------------------------------
- */
- 
-#postnav h2 {
-	display: none;
-}
-
-#postnav p {
-	position:absolute;
-	top:80px;
-	left:0px;
-	width:100%;
-	color:#999;
-	font-size:11px;
-	font-weight:bold;
-	padding:0px 5px 0px 10px;
-}
-
-/*----------------------------------------------------------------------------------
  * PAGE > MAIN > SUBNAV
  *----------------------------------------------------------------------------------
  */
@@ -233,7 +211,7 @@ body {
 	width: 80%;
 }
 
-#subnav ul li {
+#subnav li {
 	display: block;
 	float: left;
 
@@ -241,7 +219,7 @@ body {
 
 }
 
-#subnav ul li a {
+#subnav li a {
 	font-size: 11px;
 	letter-spacing: 0.1em;
 	text-transform: uppercase;
@@ -253,8 +231,8 @@ body {
 	background: #CCC;
 }
 
-#subnav ul li.selected a, 
-#subnav ul li a:hover {
+#subnav li.selected a, 
+#subnav li a:hover {
 	background-color: #6CB7F8;
 	border: 1px solid #3F83CE;
 	color: #FFF;
diff --git a/wik/wik.css b/wik/wik.css
index 207ab40..63a4eb8 100644
--- a/wik/wik.css
+++ b/wik/wik.css
@@ -104,7 +104,7 @@ body {
 	font-weight: bold;
 }
 
-#header p {
+#header a {
 	float: right;
 	font-size: 14px;
 	color: #FFF;
@@ -113,21 +113,18 @@ body {
 	margin-top: 0px;
 }
 
-#header a {
-	color: #FFF;
-}
-
 /*----------------------------------------------------------------------------------
  * PAGE > HEADER > LOGO
  *--------------------------------------------------------------------------------*/
-#logo h1 {
+#header h1 {
 	display: none;
 }
 
 /* hostname */
-#logo p {
+#header p.hostname {
 	float: left;
 	margin:	1px 1px 1px 10px;
+	color: #FFF;
 }
 
 /*----------------------------------------------------------------------------------
@@ -150,19 +147,14 @@ body {
 	min-height: 150px;
 	width: 150px;
 	margin: -20px 10px 10px 0px;
-	padding: 0px 0px 0px 10px;
+	padding: 160px 0px 0px 10px;
 	background-image: url("images/alogo.png");
 	background-repeat: no-repeat;
 	background-position: center top; 
-
-}
-
-#nav ul {
-	margin-top: 160px;
 	list-style-type: none;
 }
 
-#nav ul li {
+#nav li {
 	margin-top: 20px;
 	color: #555555;
 	font-size: 12px;
@@ -170,7 +162,7 @@ body {
 	overflow: hidden;
 }
 
-#nav ul li ul {
+#nav li ul {
 	margin-top: 6px;
 	padding-top: 6px;
 	background-image: none;
@@ -179,7 +171,7 @@ body {
 	background-position: center top; 
 }
 
-#nav ul li ul li {
+#nav li ul li {
 	margin:	0px 0px 0px 0px;
 	padding: 0px 0px 0px 0px;
 	height: 21px;
@@ -190,47 +182,38 @@ body {
 	background-image: none;
 }
 
-#nav ul li ul li.selected {
+#nav li ul li.selected {
 	font-weight: bold;
 }
 
-#nav ul li ul li a {
+#nav li ul li a {
 	clear: 	right;
 	display: list-item;
 }
 
-#nav ul li ul li a:hover {
+#nav li ul li a:hover {
 	background-image: none;
 }
 
-#nav ul li ul li.selected a:hover {
+#nav li ul li.selected a:hover {
 	background-image: none;
 }
 
 
 /*----------------------------------------------------------------------------------
- * PAGE > MAIN > POSTNAV
- *--------------------------------------------------------------------------------*/
-#postnav {
-	display: none;
-}
-
-/*----------------------------------------------------------------------------------
  * PAGE > MAIN > SUBNAV
  *--------------------------------------------------------------------------------*/
 #subnav {
 	position: relative;
 	top: 1px;
-}
 
-#subnav ul {
 	margin:	0px 0px 0px 170px;
 	padding: 0px 0px 0px 10px;
 
 	overflow: auto;
 }
 
-#subnav ul li {
+#subnav li {
 	display: block;
 	float: left;
 
@@ -248,7 +231,7 @@ body {
 	padding: 0px 0px 0px 0px;
 }
 
-#subnav ul li.selected {
+#subnav li.selected {
 	border-bottom: 1px solid #ffffff;
 	background-image: url("images/tab-current-fade.png");
 	background-repeat: repeat-x;