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

3 files changed, 21 insertions, 64 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index 18e3e76..c61c4fa 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -61,7 +61,7 @@ a:active {
 #trophy{
 position:fixed;
 right:2;
-bottom:30;
+bottom:15px;
 
 }
 #effects-msg{
@@ -76,16 +76,11 @@ color:#000;
 #tinychat-wrapper{
 z-index:55;
 width:700px;
-right:30px;
-height:654px;
-display:none;
-padding-bottom:40px;
+right:30px;height:350px;
 position:absolute;
-bottom:190;
-margin-bottom:-154px;
+bottom:76;
 }
 #tinychat-wrapper object{
-padding-top:310px;
 }
 #footerc
 {
@@ -156,13 +151,12 @@ left:0.2%;
 	min-width:500px;
 	z-index:100;
 left:3px;
-bottom:10px;
+bottom: -5px;
 	width: 100%;
 }
 
 #msgInput {
 	z-index:100;
-    margin-top: 15px;
 	left:-3px;border:1px solid #000;
     position:relative;border-right:0px;
 height:35px;
@@ -186,7 +180,7 @@ height:0px;
 height:35px;
 right:285px;
 font-size:20px;background-image:url(/static/img/e9.png);
-top:15px;
+top:0;
 	text-align:center;
 	z-index:100;
 border:1px solid #000;
@@ -210,7 +204,7 @@ height:35px;
 background-position:center;
 right:5px;
 border:1px solid #000;
-top:15px;
+top:0;
 padding-bottom:1;
 	text-align:center;
 	z-index:100;
@@ -232,7 +226,7 @@ background-color:#fff;
 height:35px;
 background-position:center;
 right:5px;
-top:15px;
+top:0;
 padding-bottom:4;
 	text-align:center;
 	z-index:100;
@@ -249,8 +243,8 @@ border:1px solid #000;
 
 #webcam-button-close { /* 16 x 14 */
   position: fixed;
-  bottom: 330px; /* 240 + 68 - (16 / 2) */
-  right: 335px; /* 320 - (14 / 2) */
+  bottom: 450px; /* 240 + 68 - (16 / 2) */
+  right: 495px; /* 320 - (14 / 2) */
   z-index: 5001;
 border:1px solid #000;
   cursor: pointer;
@@ -261,20 +255,10 @@ border:1px solid #000;
   bottom: 82;
 opacity:0.9;
   right:30;
-		box-shadow: 3px 4px 4px #c8cbce;
--webkit-box-shadow: 3px 4px 4px #c8cbce;
--moz-box-shadow: 3px 3px 4px #c8cbce;
+		
 	border-top-right-radius:5px;
 	background-color:#FFF;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
+	
 border:1px solid #000;
   z-index:5000;
 }
@@ -286,7 +270,8 @@ border:1px solid #000;
 height:35px;
 background-position:center;
 right:125px;
-top:15px;background-image:url(/static/img/e9.png);
+top:0;
+background-image:url(/static/img/e9.png);
 padding-bottom:1;
 	text-align:center;
 	z-index:100;
@@ -325,7 +310,7 @@ background-position:top right;
 	width:40px;
   height:35px;
   right:245px;
-  top:15px;
+  top:0;
   padding-bottom:1;
 	text-align:center;
 	z-index:100;
@@ -905,32 +890,17 @@ image-rendering: -moz-crisp-edges;
     max-height:50px;
     height: expression(this.width > 50 ? 50: true);
     max-width:50px;
-		 border-top-left-radius:5px;
-	border-top-right-radius:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
 margin-top:0;
-border:1px solid #f0e0d6;
-	box-shadow:2px 2px 5px #d8dbde;
-  -webkit-box-shadow:2px 2px 5px #d8dbde;
-  -moz-box-shadow:2px 2px 5px #d8dbde;
+
  
 }
 #dlogavatar{
-margin-left:-85;
+margin-left:-82px;
 height:25;
 background-image:url(/static/img/leftarrow.png);
 width:70;
 	background-repeat:no-repeat;
-	background-position:59 4;
+	background-position:55 4;
 margin-top:-20;
 z-index:5555;
 
@@ -943,8 +913,7 @@ z-index:5555;
     height: expression(this.width > 600 ? 600: true);
 	border:0px;
 	z-index:4;
-	
-   
+
   
 }
 .dlogged-dump{ 
@@ -961,18 +930,6 @@ border:1px solid #f0e0d6;
 margin-left:20px;
 margin-bottom:20px;
 	z-index:4;
-		 border-top-left-radius:5px;
-	border-top-right-radius:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
 	line-height:20px;
 	text-align: left;
 
@@ -996,12 +953,12 @@ top:;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 border:1px solid #000;
-margin-left:-30;
+margin-right:-30;display:none;
 color:#000;
 background-color:#fff;
 padding:3;
 text-transform:uppercase;
-margin-top:-54;
+margin-top:-74;
 }
    #dprofile {
 	float: right;
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js
index 411c86d..f7ff5c4 100644
--- a/static/webcam/webcam.js
+++ b/static/webcam/webcam.js
@@ -56,7 +56,7 @@ window.webcam = {
 
     show: function() {
         var closeHtml = '<img src="/static/webcam/close.gif" onclick="webcam.hide()" id="webcam-button-close" />'
-        var camHtml = '<div id="webcam-preview">' + webcam.get_html(320, 240) + closeHtml + "</div>" 
+        var camHtml = '<div id="webcam-preview">' + webcam.get_html(480, 360) + closeHtml + "</div>" 
         $("body").append(camHtml)
         $("#webcam-button-upload").addClass("invisible")
         $("#webcam-button-snap").removeClass("invisible")
diff --git a/static/webcam/webcam.swf b/static/webcam/webcam.swf
index ce7b114..122624e 100644
--- a/static/webcam/webcam.swf
+++ b/static/webcam/webcam.swf