timb merging ryder's changes

6 files changed, 70 insertions, 18 deletions

diff --git a/static/cambutton.png b/static/cambutton.png
new file mode 100644
index 0000000..3cb942e
--- /dev/null
+++ b/static/cambutton.png
diff --git a/static/header.css b/static/header.css
index 514ab79..1aa1d1c 100755
--- a/static/header.css
+++ b/static/header.css
@@ -48,7 +48,8 @@ word-spacing:2;
 width:365;
 color:#fff;
 text-indent:14;
-line-height:1.7;
+line-height:1.9;
+font-weight:bold;
 	left: 140px;
 	margin-left: 1.2%;
 	margin-right: 8%;
@@ -95,15 +96,17 @@ margin-top:2;
 }
 #logo7 a{font-size:42;
 font-weight:bold;
-	text-shadow: 1px 1px 1px #00,  1px -2px 1px #f0e;
+
+
+
+		text-shadow: 2px 3px 1px #f0e,  3px 3px 1px #fff;
 letter-spacing:-4;
 color:#fff;
 
 }
 #logo7 a:hover{
 
-		text-shadow: 2px 3px 1px #f0e,  3px 3px 1px #fff;
-
+	text-shadow: 1px 1px 1px #000,   2px 3px 1px #f0e;
 color:#fff;     
 }
 
diff --git a/static/index.html b/static/index.html
index 7710601..c3006af 100755
--- a/static/index.html
+++ b/static/index.html
@@ -71,7 +71,9 @@ body {
 	top: 12px;
 	left: 140px;
 }
+#remember{
 
+}
 #customer {
   position: absolute;
   left: -80px;
@@ -151,6 +153,19 @@ line-height:-1;
 	border:solid 1px #eee;
 }
 
+#remembermeInput {
+ width: 15px;
+ height: 15px;
+ margin: 1px;
+}
+
+label {
+ display: block;
+ width: 300px;
+ text-align: right;
+ font-size: 16px;
+ color: #222;
+}
 
 </style>
 </head>
@@ -174,14 +189,15 @@ line-height:-1;
     </div>
     <input type="text" id="nickInput" size="17" />
     <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
-    <input type="password" id="passwordInput" size="17" />
+    <input type="password" id="passwordInput" size="17" /><br />
+
 
-    <label>
-      <input type="checkbox" name="rememberme" id="remembermeInput" />
-      Remember Me
-    </label>
     <!-- <br /><a id="signin-submit">Sign In</a> -->
     <input id="signin-submit" value="Sign In" />
+        <div id="remember"><label>
+      <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+      Remember Me
+    </label></div>
   </div>
 </div>
 <div id="info" align="right">
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;   
diff --git a/static/upbutton.png b/static/upbutton.png
index 56a94f7..8129526 100644
--- a/static/upbutton.png
+++ b/static/upbutton.png
diff --git a/static/urlbutton.png b/static/urlbutton.png
new file mode 100644
index 0000000..cbbe031
--- /dev/null
+++ b/static/urlbutton.png