fix merge

1 files changed, 15 insertions, 5 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index 6f519bc..48135a3 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -142,7 +142,7 @@ line-height:1.9;
 }
 
 #bar7 img{
-margin-top:4;display:none;
+margin-top:4;
   vertical-align: top;
 }
 #bar7 a{
@@ -993,7 +993,6 @@ border-bottom:2px solid #c8cbce;
 -moz-box-shadow: 3px 3px 3px #c8cbce;
 	text-overflow:ellipsis;
 /* opacity:0.75;*/
-	z-index:18;
 	text-align: left;
 
 background-image:url(/static/img/bg.dither.gif);
@@ -1003,7 +1002,6 @@ background-image:url(/static/img/bg.dither.gif);
 margin-top:6px;
 line-height:20px;
 text-indent:6px;
-z-index:18;
 min-width:90px;
 overflow:hidden;
 
@@ -1057,7 +1055,6 @@ background-color:#f3f3f3;
     max-width:30px;
 	float:right;
 	right:1px;
-	z-index:77;
 	height:30px;
 	border-top-left-radius:3px;
 	border-top-right-radius:3px;
@@ -1248,6 +1245,7 @@ background-color:#0c8fff;
 	-moz-border-radius-bottomleft:5px;
 }
 
+
 #edit-toggle a{font-size:12;
 letter-spacing:;
 
@@ -1909,4 +1907,16 @@ border:1px solid #000;
 position:absolute;
 height:30px;left:255px;
 bottom:30px;
-}
\ No newline at end of file
+}
+
+/*HALL STUFF */
+#messagePaneh {
+width:99%;
+position:fixed;
+margin-left:-3px;
+border:8px inset yellow;
+bottom:25px;
+top:50px;
+	background-color:#fff;
+	z-index:5;
+}