timb merging conflicted css

1 files changed, 0 insertions, 28 deletions

diff --git a/static/header.css b/static/header.css
index 9c6b57c..e4df65e 100755
--- a/static/header.css
+++ b/static/header.css
@@ -91,32 +91,4 @@ top:20;
 	height: 62px;
 	z-index: 1000;
 }
-#topnav {
-	padding:10px 0px 12px;
-	font-size:11px;
-	line-height:23px;
-	text-align:right;
-}
-#topnav a.signin {
-	background:#88bbd4;
-	padding:4px 6px 6px;
-	text-decoration:none;
-	font-weight:bold;
-	color:#fff;
-	-webkit-border-radius:4px;
-	-moz-border-radius:4px;
-	border-radius:4px;
-	*background:transparent url("images/signin-nav-bg-ie.png") no-repeat 0 0;
-	*padding:4px 12px 6px;
-}
-#topnav a.signin:hover {
-	background:#59B;
-	*background:transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0;
-	*padding:4px 12px 6px;
-}
-#topnav a.signin, #topnav a.signin:hover {
-	*background-position:0 3px!important;
-}
-
 
-/* End CSS Drop Down Menu */