timb merging ryder's changes

1 files changed, 42 insertions, 9 deletions

diff --git a/static/pichat.css b/static/pichat.css
index fa9325c..9ccb725 100755
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -117,31 +117,36 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#eee, offX=3, offY=4,
 	z-index:100;
 }
 #msginputrapper{
-margin-right:239;
+margin-right:359;
 
 }
 #msgSubmit {
-	
+			border-top-right-radius:10px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	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;
 height:35px;
-right:120px;
+right:240px;
 font-size:20px;
-background-image:url(/static/btngrad1.png);
-text-indent:3;
+background-image:url(/static/urlbutton.png);
+text-indent:27;
 
 top:15px;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
 	background-color:red;
-
 	font-size:12px;
 	color:#fff;
 	text-shadow:1px 1px 3px rgba(0,0,0,1);
 }
-#upload {
+#webcam{
 		border-top-right-radius:10px;
 	-webkit-border-top-right-radius:5px;
 	-moz-border-radius-topright:5px;
@@ -157,14 +162,41 @@ background-position:center;
 right:0;
 top:15px;
 padding-bottom:1;
-text-indent:3;
+text-indent:28;
+	text-align:center;
+	z-index:100;
+	cursor:pointer;
+background-color:yellow;
+	font-size:12px;
+	color:#fff;
+background-image:url(/static/cambutton.png);
+
+	text-shadow:1px 1px 3px rgba(0,0,0,1);
+}
+#upload {
+		border-top-right-radius:10px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	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;
+height:35px;
+background-position:center;
+right:120;
+top:15px;
+padding-bottom:1;
+text-indent:24;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
 background-color:blue;
 	font-size:12px;
 	color:#fff;
-background-image:url(/static/upbutton1.png);
+background-image:url(/static/upbutton.png);
 
 	text-shadow:1px 1px 3px rgba(0,0,0,1);
 }
@@ -174,6 +206,7 @@ background-image:url(/static/upbutton1.png);
     max-height:400px;
     height: expression(this.width > 400 ? 400: true);
     max-width:400px;
+margin:-2;
  z-index: 1;
 }
 .msgDiv {padding:2px;