updates

builders · Jun 30, 2012 · e7228a7 · e7228a7
1 parent 9f7b0b4
commit e7228a7
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 56 deletions.
diff --git a/www/httpdocs/workspace/themes/active/css/common.css b/www/httpdocs/workspace/themes/active/css/common.css
diff --git a/www/httpdocs/workspace/themes/active/less/common.less b/www/httpdocs/workspace/themes/active/less/common.less
@@ -327,10 +327,10 @@ h3 {
 	margin-right: @base;
 }
 
-.logo {
-	margin-top: 10px;
-	float: left;
-	z-index: 2;
+
+
+body  .mast  .container  .row  .span12  a.logo {
+	z-index: 20 !important;
 }
 
 .divider {
@@ -343,14 +343,71 @@ h3 {
 	margin: @base * 3 0 @base * 3 0;
 
 	.container {
+
 		.row {
 			margin-left: 0;
 
 			.span12 {
 				margin-left: 0;
-				z-index: 1;
+
+					.logo {
+						position: relative;
+						top: -5px;
+						float: left;
+					}
+
+					.main {
+						#font > #proxima > .regular;
+						float: right;
+						position: relative;
+						display: block;
+						text-transform: uppercase;
+						font-size: 18px;
+						margin-top: 47px;
+						padding-right:  0;
+						margin-right: 0;
+						letter-spacing: 1px;
+						z-index: 10;
+
+						li {
+							margin-right: 10px;
+							display: inline;
+							&.active {
+
+								a {
+									background: none;
+									color: @color-accent;
+
+									&:hover {
+										color: darken(@color-accent, 10%);
+									}
+								}
+							}
+
+							&.last {
+								margin-right: 0;
+
+								a {
+									margin-right: 0;
+								}
+							}
+
+							a {
+								display: inline;
+								color: #ffffff;
+
+								&:hover {
+									background: none;
+									color: darken(@color-mast, 35%);
+								}
+							}
+						}
+					}
+
 			}
+
 		}
+
 	}
 
 	.row {
@@ -575,56 +632,6 @@ h3 {
 	margin-bottom: 0;
 }
 
-.header {
-
-	.main {
-		#font > #proxima > .regular;
-		float: right;
-		position: relative;
-		display: block;
-		text-transform: uppercase;
-		font-size: 18px;
-		margin-top: 47px;
-		padding-right:  0;
-		margin-right: 0;
-		letter-spacing: 1px;
-
-		li {
-			margin-right: 10px;
-			display: inline;
-			&.active {
-
-				a {
-					background: none;
-					color: @color-accent;
-
-					&:hover {
-						color: darken(@color-accent, 10%);
-					}
-				}
-			}
-
-			&.last {
-				margin-right: 0;
-
-				a {
-					margin-right: 0;
-				}
-			}
-
-			a {
-				display: inline;
-				color: #ffffff;
-
-				&:hover {
-					background: none;
-					color: darken(@color-mast, 35%);
-				}
-			}
-		}
-	}
-}
-
 .jumbotron {
 
 	h1 {