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

author: Scott Ostler <sostler@deathmachine.home> 2009-12-25 18:00:09 -0800
committer: Scott Ostler <sostler@deathmachine.home> 2009-12-25 18:00:09 -0800
commit: fe1b5678c330f0c3ec0e05a2295144338cadd5a6 (patch)
tree: 31034ea3f5fca9c28a072f0e4d3bde1c4502e409 /static
parent: c32ed3d3f5623899d0b0d6c74daca106be26dae0 (diff)
parent: a80eb3d74a24a56151d60d1c1015a1ae51a0a492 (diff)
6 files changed, 71 insertions, 269 deletions
diff --git a/static/chat.st b/static/chat.st
deleted file mode 100755
index e601350..0000000
--- a/static/chat.st
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-  <head>
-    <title>dump.fm</title>
-    <link rel="stylesheet" type="text/css" href="/static/reset.css">
-    <link rel="stylesheet" type="text/css" href="static/pichat.css">
-
-    <link rel="shortcut icon" href="/static/favicon.ico">
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/sha1.js"></script>
-    <script type="text/javascript" src="/static/pichat.js"></script>
-    <script>
-      jQuery(document).ready(initChat);
-      var Nick = $json_user_nick$;
-    </script>   
-  </head>
-
-<body>
-    
-
-    $header()$
-
-<div id="chatrap"><div id="logc">
-    <div id="content">
-
-        <div id="messagetabs"></div>
-        <div id="rapper">
-            <div id="loghead"></div>
-          </div>
-      <div id="userList">
-            $users: { u |
-    <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br>
-      <hr>
-    </div>
-        }$
-      </div>
-          
-          <div id="messagePane">
-            <div id="messageList">
-              $messages: { m |
-                  <div class="msgDiv oldmsg"><b>$m.nick$: </b>
-                    <span class="content">$m.content$<span></div>
-              }$
-              <hr />
-            </div>
-            $if(user_nick)$
-            <div id="msgInputDiv">
-              <input id="msgInput" class="msgInput" type="input" />
-              <input id="msgSubmit" type="submit" value="Send Image URL"
-                      />
-            </div>
-            $endif$
-          </div>
-        </div>
-        
-      </div>
-    </div>
-    </div>
-
-      </div>
-   
-    </div>
-        <div id="footerc">
-       <p>
-       $footer()$</p>
-       <p>
-       </p>
-     </div>
-  </body>
-</html>
diff --git a/static/header.css b/static/header.css
index e2357c4..2087142 100644
--- a/static/header.css
+++ b/static/header.css
@@ -10,10 +10,12 @@
 }
 .white a:hover {
 	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
+	text-shadow: -1px 1px 1px #;
+	background-color:#036aca;
 	
 	
-	color: #FFF;
+	
+	color: #fff;
 }
 .white a:active {
 	text-decoration: none;
@@ -26,6 +28,7 @@
 	background-attachment:inherit;
 	margin: 0px auto -1px auto;
 	top: 0px;
+	position:fixed;
 	width:100%;
 	left: 0px;
 	height: 69px;
@@ -37,7 +40,7 @@
 	width: 500px;
 	font-size: 18px;
 	left: 150px;
-	margin-left: 2%;
+	margin-left: 3%;
 	margin-right: 8%;
 	letter-spacing: -1px;
 	z-index: 999;
@@ -58,6 +61,7 @@
 	margin-right: 10%;
 	z-index:1000;
 	float:left;
+	margin-top: 3px;
 }
 #rapper7{
 	top: 0px;
diff --git a/static/header.st b/static/header.st
deleted file mode 100755
index cd8be34..0000000
--- a/static/header.st
+++ /dev/null
@@ -1,133 +0,0 @@
-<head>
-    <link rel="stylesheet" type="text/css" href="static/reset.css">
-        <link rel="shortcut icon" href="static/favicon.ico">
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    
-    </head>
-<style type="text/css">
-<!--
-.white a:link {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-.white a:visited {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-.white a:hover {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	
-	
-	color: #fff;
-}
-.white a:active {
-	text-decoration: none;
-	
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-#header7{
-	background-image:url(/static/dblue2.png);
-	background-attachment:inherit;
-	margin: 0px auto -1px auto;
-	top: 0px;
-	width:100%;
-	left: 0px;
-	height: 69px;
-}
-#bar7{
-	top:31px;
-	position:absolute;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	width: 500px;
-	font-size: 20px;
-	left: 170px;
-	margin-left: 11%;
-	margin-right: 8%;
-	letter-spacing: -1px;
-	z-index: 999;
-}
-#logout7{
-	top:5px;
-	position:relative;
-	font-size:13px;
-	margin-right: 10px;
-	float:right;
-	z-index: 999;
-	font-family: "Times New Roman", Times, serif;
-}
-#logo7{
-	top:20px;
-	margin-left: 10%;
-	margin-right: 10%;
-	z-index:1000;
-	float:left;
-}
-#rapper7{
-	top: 0px;
-	left:0px;
-	position:absolute;
-	width: 100%;
-	height: 78px;
-	z-index: 1000;
-}
-p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; }
-td {
-	font-family: Arial, Helvetica, sans-serif;
-	letter-spacing:-1px;
-	font-size: 12px;
-	color: #000000;
-}
-.btnav {  border: 0px #000000 solid;} 
-body {
-	
-	
-	background:#e3e3e3;
-	 background:transparent color(demo/bg-random.gif);
-	 background-position:center;
-	
-}
-
-
--->
-</style>
-
-<body>
-<div id="rapper7">
-<div id="header7">
-
- 
-
-
-      <div id="logo7">
-        <div align="center"><img src="http://www.dump.fm/static/wordlogo2.gif" width="155" height="73"></div>
-    </div>
-    <div class="white">
-
-      <div id="bar7">
-        <div style="float: left;">
-          <div align="center">$if(user_nick)$&nbsp; 
-            <a href="/u/$user_nick$">Home</a> |
-    $else$ <a href="/register">Join</a> |
-    $endif$
-    <a href="/chat">Room A</a>
-    $if(user_nick)$ $endif$
-          | Extras | Discover</div>
-        </div>
-    </div>
-</div>
-  <div id="logout7" class="white">    
-     <div align="center">$if(user_nick)$ <a href="/logout">Logout</a> $else$ <a href="/" class="btnav">Log In</a>$endif$
-     </div>
-   </div>
-    <div align="center"><br />
-    </div>
-</div>
-</div>
-</div>
-
-</body>
-\ No newline at end of file
diff --git a/static/mouseover.gif b/static/mouseover.gif
new file mode 100644
index 0000000..2c6ee3e
--- /dev/null
+++ b/static/mouseover.gif
diff --git a/static/pichat.css b/static/pichat.css
index 7130dd7..f7ec7a8 100644
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -58,7 +58,7 @@ a:active {
 
 #messagePane {
 	border: 2px solid #15fff3;
-height:80%;
+height:78%;
 	padding: 5px;
 	position:fixed;
 	width: 98%;
@@ -170,7 +170,7 @@ top:15px;
 #userList {
 	overflow-x: hidden;
 
-	height: 78%;
+	height: 75%;
 	margin: 0px;
 	position: absolute;
 	padding: 5px;
@@ -180,7 +180,7 @@ top:15px;
 	right: 40px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 14px;
-	font-weight:400;
+	font-weight:420;
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -194,7 +194,7 @@ top:15px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 	min-width:90px;
-	line-height:15px;
+	
 	text-overflow:ellipsis;
 
 
@@ -224,7 +224,7 @@ height:100%;
 color:#000;
 
 text-decoration:none;
-background-color:#f5f5f5;
+background-color:#f3f3f3;
 
 
 	border-top-right-radius:5px;
@@ -380,14 +380,12 @@ background-color:#f5f5f5;
 	position:absolute;
 	width:100%;
 	bottom:0px;
-	font-size:10px;
+	font-size:7px;
 	font-family:"Times New Roman", Times, serif;
 	background-image:url(/static/footer.png);
 	background-repeat:repeat-x;
 	background-position:top;
-	height:30px;
 	color: #000;
-	line-height: 2;
 }
 #log
 {
@@ -491,7 +489,10 @@ background-color:#f5f5f5;
 	left: -40px;
       }
 
-p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; }
+p {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 7px;
+}
 td {
 	font-family: Arial, Helvetica, sans-serif;
 	letter-spacing:-1px;
diff --git a/static/profile.css b/static/profile.css
index 2984f43..ff11cac 100644
--- a/static/profile.css
+++ b/static/profile.css
@@ -2,36 +2,35 @@
 	float: right;
 	padding: 20px;
 	width: 180px;
-	margin-top:0px;
-	background-color:#F7F7F7;
+position:absolute;
+top:0px;
+right:15;
+	margin-top:15px;
+	background-color:#f5f5f5;
 	background-image:url(/static/spex.ppng);
-	border:solid 5px #F5F5F5;
+	border:solid 1px #999;
+
+
+
 	background-position:center;
-	z-index:10;
-	box-shadow:rgba(0,0,0,0.5) 0px 0px 24px;
-	border-radius:5px;
-	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;
-	min-height:600px;
-	margin-right: 5%;
+	z-index:999;
+
+min-height:600px;
+height:98%;
+
+line-height:1.6;
+
       }
 #chatrap{
-	top: 80px;
-	left:0px;
-	position:absolute;
-	width: 100%;
-	margin: 0;
+	top: 10px;
+min-width:800px;
+
+	position:relative;
+
+width:100%;
+
 	padding-bottom:105px;
+
 }
 #footer
 {
@@ -41,7 +40,7 @@
 	bottom:0px;
 	font-size:12px;
 	font-family:"Times New Roman", Times, serif;
-	background-image:url(/static/footer.png);
+	background-image:url(/static/footer.pg);
 	background-repeat:repeat-x;
 	background-position:top;
 	height:30px;
@@ -50,10 +49,13 @@
 }
 #log
 {
-	margin-right:5%;
-	margin-left:5%;
-	background-color:#FFF;
-	padding-left: 20px;
+
+	background-color:#f;
+
+position:absolute;
+width:100%;
+top:50px;
+margin-right:5px;
 	padding-bottom: 20px;
 	padding-top: 15px;
 	min-height: 800px;
@@ -69,7 +71,7 @@
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
-	border:solid 5px #F5F5F5;
+	border:solid 5px #f;
 }
 #posts {
 	
@@ -91,26 +93,26 @@
 
 
 
-
 	padding: 15px;
 	font-family: Arial, Helvetica, sans-serif;
-	margin-left:15%;
-	width:50%;
+
+margin-right:15px;
+
+
 	
 	font-size: 12px;
 	text-transform: uppercase;
-	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;
-	min-width:500px;
+	
+
 	line-height:15px;
-	background-color:#F5F5F5;
+	background-color:#fff;
 	background-image:/static/footer.png;
 	background-position:bottom;
-	border:solid 1px #0f1e31;
+
 	z-index:4;
 	line-height:20px;
 	text-align: left;
-	margin:15px;
+	margin-left:15px;
 	
 }
       .editable {
@@ -124,9 +126,18 @@
           text-overflow: ellipsis;
       }
 	  h2 {
-	color:#000;
+
 	letter-spacing:-1px;
 	font-weight:lighter;
+color:#087cff;
+
+	height:28px;
+	font-size:33px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	text-transform:capitalize;
+
+	text-shadow: -6px 4px 4px #ccc;
 }
 
       img#avatarPic {
@@ -138,20 +149,7 @@
           padding: 5px;
       }
 	        #loghead {
-	border-bottom:0px;
-	padding-left: -50px;
-	margin-right:60%;
-	width:auto;
-	letter-spacing:-3px;
-	color:#087cff;
-	height:28px;
-	font-size:33px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:bold;
-	text-transform:capitalize;
-	text-shadow: -6px 4px 4px #ccc;
-	padding-bottom:12px;
-	left: -40px;
+				font-size:1px;
       }
 
     body {
@@ -160,6 +158,7 @@
 }
 body,td,th {
 	font-family: Arial, Helvetica, sans-serif;
+	overflow-x:hidden;
 	
 }@charset "UTF-8";
 /* CSS Document */
author	Scott Ostler <sostler@deathmachine.home>	2009-12-25 18:00:09 -0800
committer	Scott Ostler <sostler@deathmachine.home>	2009-12-25 18:00:09 -0800
commit	fe1b5678c330f0c3ec0e05a2295144338cadd5a6 (patch)
tree	31034ea3f5fca9c28a072f0e4d3bde1c4502e409 /static
parent	c32ed3d3f5623899d0b0d6c74daca106be26dae0 (diff)
parent	a80eb3d74a24a56151d60d1c1015a1ae51a0a492 (diff)