Merge branch 'master' of ssh://dump.fm/pichat/repo

6 files changed, 30 insertions, 37 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index ddc5e81..de50535 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -103,7 +103,7 @@ color:000;
 
 #messagePane {
 
-top:2px;
+top:40px;
 bottom:65px;
 	position:fixed;
 	width: 99.6%;
@@ -135,8 +135,7 @@ left:0.2%;
 	position:relative;
 	min-width:500px;
 	z-index:100;
-left:2px;
-
+left:3px;
 bottom:10px;
 	width: 100%;
 }
@@ -187,7 +186,6 @@ border-right:0px;
 	border-bottom-right-radius:5px;
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomright:5px;
-	border-radius:5px;
 	position:absolute;
 	display:inline-block;
 	width:120px;
@@ -211,7 +209,6 @@ background-color:#fff;
 	border-bottom-right-radius:5px;
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomright:5px;
-	border-radius:5px;
 	position:absolute;
 	display:inline-block;
 	width:120px;
@@ -223,7 +220,7 @@ padding-bottom:4;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
-background-color:#fff;
+background-color:#ccc;
 	font-size:17px;
 	color:#fff;
 border:1px solid #000;
@@ -308,7 +305,6 @@ opacity:1;
 
 #palette-button {
 border:1px solid #000;
-	border-radius:5px;
 background-position:top right;
 	position:absolute;
 /*	display:inline-block;*/
diff --git a/static/css/header.css b/static/css/header.css
index 004fc1e..1d6e2ec 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -44,11 +44,11 @@ margin-right:80%;
 	top:-1px;
 height:38;
 	position:fixed;
-background-color:#000;
+background-color:#fff;
 border:1px solid #000;
-width:84.2%;
+width:100%;
 min-width:600px;
-	left:16%;
+
 	border-bottom-left-radius:5px;
 	border-bottom-right-radius:5px;
 	-webkit-border-bottom-left-radius:5px;
@@ -67,7 +67,7 @@ min-width:600px;
 	font-size: 16px;
 height:22;
 width:455;
-color:#fff;
+color:#000;
 text-indent:14;
 line-height:1.9;
 font-weight:bold;
@@ -88,14 +88,13 @@ margin-top:4;display:none;
 	text-decoration: none;
 	font-size:13;
 padding:6;
-	color: #fff;
+	color: #000;
 
 }
 #bar7 a:hover{
 	text-decoration: none;
-padding:6;background-color:#fff;
-	color: #000;
-text-shadow: 1px 1px .5px #fff;
+padding:6;background-color:#000;
+	color: #fff;
 }
 #logout7{
 	top:1px;
@@ -109,10 +108,10 @@ text-shadow: 1px 1px .5px #fff;
 }
 #logout7 img{display:none;
 }
-#logout7 a{font-size:10px;color:#fff;
+#logout7 a{font-size:10px;color:#000;
 }
 #logout7 a:hover{font-size:10px;
-color:#ccc;
+color:#000;	text-shadow: -1px 1px 0px #fff;
 }
 a {
  font-size: 12px;
@@ -151,10 +150,10 @@ a:active {
 	margin-top:-2px;
 }
 #logo7 a{font-size:42;
-font-weight:bold;
+
 letter-spacing:-4;
-color:#fff;
-	text-shadow: 1px 1px 1px #000;
+color:#000;
+	text-shadow: 1px 1px 0.3px #eee;
 }
 #logo7 a:hover{
 
@@ -163,25 +162,24 @@ color:#fff;
 }
 
 #vippp{
-	top:0px;
+	top:-3px;
 	position:absolute;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 height:30;
 word-spacing:2;
-color:#fff;
+color:#000;
 text-indent:14;
 line-height:1.8;
-	text-shadow: -1px 1px 0px #;
 	right:65px;
 text-transform:capatalize;
 	margin-right:0;
 	letter-spacing:.2px;
 	z-index: 999;
 }
-#vippp a{color:fff;font-size:11;
+#vippp a{color:#000;font-size:10;
 }
-#vippp a:hover{color:fff;
+#vippp a:hover{color:#ccc;
 text-shadow: 0px 0px 0.3px #fff;
 }
 #rapper7{
diff --git a/static/css/profile.css b/static/css/profile.css
index a507eee..613469a 100755
--- a/static/css/profile.css
+++ b/static/css/profile.css
@@ -168,8 +168,9 @@ text-indent:6;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 height:32;
-text-transform:capitalize;
-	background-image:url(/static/img/upload.png);
+text-transform:lowercase;
+border:1px solid #000;
+background-color:#fff;
 
 
 }
@@ -183,7 +184,8 @@ width:96;
 height:32;
 padding:2;
 border:1px;
-	background-image:url(/static/img/upload.png);
+border:1px solid #000;
+background-color:#fff;
 		 border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -200,9 +202,8 @@ border:1px;
 }
 #pnav a {
 	font-size: 30px;
-	color:#fff;
+	color:#000;
 text-transform:lowercase;
-text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0;
 }
 pnav a:link {
 	text-decoration: none;
@@ -214,9 +215,7 @@ a:visited {
 }
 #pnav a:hover {
 	text-decoration: none;
-	color: #fff;
-text-shadow: blue 2px 2px 0, red -20px -2px 0, green 6px 4px 0;
-
+	color: #000;	text-shadow: 1px 1px 1px #999;
 
 }
 a:active {
diff --git a/template/about_us.st b/template/about_us.st
index 4f3f4dc..e198330 100644
--- a/template/about_us.st
+++ b/template/about_us.st
@@ -64,7 +64,7 @@ DUMP.FM is a <img src="/static/img/newanim.gif"> exciting tool for the internets
 
 
 <h5><br>
-Oh hai! We're based in NYC...<br><br>
+Hi! We're based in NYC...<br><br>
 You can shoot us an email at 
 <a href="mailto:info@dump.fm"> info@dump.fm</a></h5><br><br></center></div>
     </div>
diff --git a/template/chat.st b/template/chat.st
index 924499b..8f87697 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -99,7 +99,7 @@ $if(user_avatar)$
                 <input id="webcam-button-upload" value="Webcam" type="submit">
                 <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">  
                              <button id="palette-button"><img src="/static/img/palette.gif"></button>
-                <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/img/trophyicon.gif"></a></div>
+                <div id="trophy" style="display:none;"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/img/trophyicon.gif"></a></div>
               </div><div id="effects-msg"class="invisible">click on your face for effects!</div>
           </div>
 $else$
@@ -111,7 +111,7 @@ $else$
               <input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();">
               <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink" onClick="showAlert();">  
                        <button id="palette-button"><img src="/static/img/palette.gif"></button>
-              <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/img/trophyicon.gif"></a></div>
+              <div id="trophy"style="display:none;"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/img/trophyicon.gif"></a></div>
             </div>
           </div>
   $chat_help_bubbles()$
diff --git a/template/chat_help_bubbles.st b/template/chat_help_bubbles.st
index ab8218f..71cd04e 100644
--- a/template/chat_help_bubbles.st
+++ b/template/chat_help_bubbles.st
@@ -1,4 +1,4 @@
-<div id="newuserwrap">
+<div id="newuserwrap" style="display:none;">
 <div id="posthelp"><img src="/static/img/furie6.png"></div>
 <div id="webcamhelp"><img src="/static/img/furie5.png"></div>
 <a href="/help"><div id="userlisthelp"><img src="/static/img/furie7.png"></div></a>