timb merging ryder's changes

6 files changed, 115 insertions, 97 deletions

diff --git a/static/header.css b/static/header.css
index 4b03c2c..e4a09a3 100755
--- a/static/header.css
+++ b/static/header.css
@@ -9,6 +9,10 @@
 	font-size:16px;
 	color: #fff;
 }
+#strapline{position:absolute;
+top:1;
+right:10%;
+}
 .white a:hover {
 	text-decoration: none;
 	text-shadow: -1px 1px 1px #;
@@ -42,13 +46,13 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#036aca, offX=3, offY
 
 }
 #bar7{
-	top:28px;
+	top:30px;
 	position:absolute;
 	font-family: Arial, Helvetica, sans-serif;
 
-	font-size: 18px;
+	font-size: 16px;
 	left: 170px;
-	margin-left: 2%;
+	margin-left: 1%;
 	margin-right: 8%;
 	letter-spacing: -1px;
 	z-index: 999;
@@ -63,6 +67,10 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#036aca, offX=3, offY
 	font-family: Arial, Helvetica, sans-serif;
 	font-weight: normal;
 }
+#logout7 a{font-size:12px;
+}
+#logout7 a:hover{font-size:12px;
+}
 #logo7{
 	top:20px;
 	margin-left: 15px;
@@ -251,9 +259,8 @@ border:0;
 .btnav {  border: 0px #000000 solid;} 
 body {
 	
-	background-color:#e3e3e3;
 	
-	 background-position:center;
+	
 	 z-index:0;
 	
 }
diff --git a/static/pichat.css b/static/pichat.css
index 40720b7..0e5fb5f 100755
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -4,6 +4,10 @@ body {
 	
 	background-color:#e3e3e3;
 	margin:0;
+	background-color:#ffffee;
+	background-image:url(/static/chanbg.png);
+	background-repeat:repeat-x;
+	background-position:top;
 	
 }
 
@@ -29,7 +33,7 @@ body {
 	position:fixed;
 	width:100%;
 	bottom:0px;
-line-height:2.5;
+line-height:3.1;
 	font-size:11px;
 word-spacing:8px;
 height:28px;
@@ -55,15 +59,12 @@ color:000;
 
 #messagePane {
 	border: 2px solid #c8cbce;
-
-
 top:56px;
 bottom:65px;
 	position:fixed;
 	width: 99%;
 	background-color:#FFF;
 left:0.3%;
-
 	z-index:5;
 }
 
@@ -164,7 +165,7 @@ top:15px;
 	position: absolute;
 	padding: 5px;
 	top:85px;
-	min-width: 150px;
+	min-width: 160px;
 	width:11%;
 	float:right;
 	right: 6%;
@@ -184,6 +185,8 @@ top:15px;
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
+border-right:2px solid #c8cbce;
+border-bottom:2px solid #c8cbce;
 	max-height:450px;
 		box-shadow: 3px 4px 4px #c8cbce;
 -webkit-box-shadow: 3px 4px 4px #c8cbce;
diff --git a/static/profile.css b/static/profile.css
index 7605fc7..91e5b92 100755
--- a/static/profile.css
+++ b/static/profile.css
@@ -1,40 +1,26 @@
     #profile {
 	float: right;
 	padding: 20px;
-	width: 180px;
+width:180;
 	position:absolute;
-	top:17px;
-	left:560;
-	margin-top:9px;
-	background-color:#f5f5f5;
+	top:30px;
+	left:642;
+	margin-top:34px;
+background-color:#fff;
 	background-image:url(/static/spexx.png);
-	border:solid 1px #999;
+
 	text-overflow: ellipsis-word;
 	background-position:top;
 	z-index:999;
 	min-height:600px;
-	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;
-		box-shadow: 10px 3px 10px #c8cbce;
--webkit-box-shadow:10px 3px 10px #c8cbce;
--moz-box-shadow:10px 3px 10px #c8cbce;
+
 	
-	line-height:1.6;
+	line-height:1.5;
       }
 #chatrap{
-  width:600 ;
+  width:800;
 
-  margin-left: 18%;
+  margin-left:auto;
   margin-right: auto ;
 
 
@@ -42,38 +28,44 @@
 
 }
 #pnav{position:absolute;
-background:#fff;
-height:25px;
+
+height:45px;
 padding-left:11;
 font-size:20px;
-margin-top:-28;
-background-image:url(/static/bgnav.jpg);
+margin-top:-40;
 background-position:top;
 font-weight:bold;
-width:260;
+width:600;
+margin-left:35;
 text-align:left;
-border:1px solid #087cff;
-left:-70;
+
+
 letter-spacing:2px;
-	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;
-		box-shadow: 15px 15px 10px #c8cbce;
--webkit-box-shadow: 15px 15px 10px #c8cbce;
--moz-box-shadow: 15px 15px 10px #c8cbce;
+
+
+}
+#pnavo{
+margin-top:20;
+background:#fff;
+width:240;
+
+height:35;
+
+}
+#pnavn{
+position:absolute;
+top:20;
+left:280;
+background:#fff;
+width:270;
+height:35;
+
+
+
 }
 #pnav a {
-	font-size: 12px;
-	color:#444;
+	font-size: 30px;
+	color:#000;
 }
 pnav a:link {
 	text-decoration: none;
@@ -85,7 +77,8 @@ a:visited {
 }
 #pnav a:hover {
 	text-decoration: none;
-	color: #f0e;
+	color: #fff;
+background:#f0e;
 }
 a:active {
 	text-decoration: none;
@@ -108,10 +101,10 @@ height:28px;
 {
 	position:absolute;
 	
-	top:50px;
+	top:70px;
 	margin-right:5px;
 	padding-top: 25px;
-	min-height: 800px;
+
 	
 	
 }
@@ -135,14 +128,26 @@ height:28px;
 
 
 text-overflow: ellipsis-word;
-	padding: 15px;
+	padding: 18px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	text-transform: uppercase;
 	line-height:15px;
 	background-color:#fff;
-border:1px solid #999;
-margin-top:-2;
+border:1px solid #eee;
+	border-top-left-radius:15px;
+	border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	-webkit-border-top-right-radius:15px;
+	-moz-border-radius-topleft:15px;
+	-moz-border-radius-topright:15px;
+	border-bottom-left-radius:15px;
+	border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-moz-border-radius-bottomleft:15px;
+	-moz-border-radius-bottomright:15px;
+margin-top:20;
 	z-index:4;
 width:600;
 	line-height:20px;
@@ -240,6 +245,12 @@ padding:20;
 }
 body,td,th {
 	font-family: Arial, Helvetica, sans-serif;
+	background-color:#ffffee;
+	background-image:url(/static/chanbg.png);
+	background-repeat:repeat-x;
+	background-position:top;
+	
+	
 
 	
-}@charset "UTF-8";
+}@charset "UTF-8";
\ No newline at end of file
diff --git a/template/browser.st b/template/browser.st
index 93da34d..33c6ba1 100755
--- a/template/browser.st
+++ b/template/browser.st
@@ -42,14 +42,14 @@
 	  </div>          
           <div id="messagePane">
             <div id="messageList">
-       <iframe src="/static/search/browser.html" style="width:100%;height:100%;padding:0px;background-color: #fff; position:absolute;  top:0px; left:0px; border:none; allowtransparency="true" scrolling="yes" ></iframe>
+       <iframe src="/static/search/browser.html" style="width:100%;height:100%;padding:0px;background-color: #fff; position:absolute;  top:0px; left:0px; border:none; allowtransparency="true" scrolling="auto" ></iframe>
 
 
             </div>
             $if(user_nick)$
             <div id="msgInputDiv">
               <input id="msgInput" class="msgInput" type="input" />
-              <input id="msgSubmit" type="submit" value="Send Text"
+              <input id="msgSubmit" type="submit" value="Send Image URL"
                      />
             </div>
             $endif$
diff --git a/template/log.st b/template/log.st
index 60eb3d5..abc0477 100755
--- a/template/log.st
+++ b/template/log.st
@@ -20,16 +20,7 @@
 
 	</div>
         <br>
-   <div id="pnav">
 
-    $if(next)$
-  <a href="/$roomkey$/log/$next$"><- OLD DUMPS</a>
-    $endif$
-    &nbsp;&nbsp;
-    $if(prev)$
-   <a href="/$roomkey$/log/$prev$">NEW DUMPS -></a>
-    $endif$
-    </div>
 
         <div id="posts">  
     $if(dumps)$
@@ -37,16 +28,20 @@
     $else$
     No dumps!
     $endif$
-   <div id="pnav">
+ <div id="pnav">
+	   <div id="pnavo">
+          $if(next)$
+          <a href="/$roomkey$/log/$next$"><- OLD DUMPS</a>
+          $endif$
+          </div>
+          	   <div id="pnavn">
+          &nbsp;&nbsp;
+          $if(prev)$
+         <a href="/$roomkey$/log/$prev$">NEW DUMPS -></a>
+          $endif$
 
-    $if(next)$
-  <a href="/$roomkey$/log/$next$"><- OLD DUMPS</a>
-    $endif$
-    &nbsp;&nbsp;
-    $if(prev)$
-   <a href="/$roomkey$/log/$prev$">NEW DUMPS -></a>
-    $endif$
-    </div>
+        <br><br>
+</div></div>
 
 
 
diff --git a/template/profile.st b/template/profile.st
index 91ca683..6204e27 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -3,11 +3,17 @@
     <title>$nick$'s dump.fm</title>
     $head()$
     <link rel="stylesheet" type="text/css" media="screen" href="/static/profile.css">
+
     <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>
 
+
     <script>
       jQuery(document).ready(initProfile);
-    </script>
+
+  
+		</script> 
+		
+
   </head>
   <body>
     $banner()$
@@ -19,15 +25,7 @@
 
 	</div>
         <br>
-  <div id="pnav">
-          $if(next)$
-          <a href="/u/$nick$/$next$"><- OLD DUMPS</a>
-          $endif$
-          &nbsp;&nbsp;
-          $if(prev)$
-         <a href="/u/$nick$/$prev$">NEW DUMPS -></a>
-          $endif$
-        </div>
+
 
         <div id="posts">          
 
@@ -49,16 +47,19 @@
 	  $endif$
 	  <p>&nbsp;</p>
 	   <div id="pnav">
+	   <div id="pnavo">
           $if(next)$
           <a href="/u/$nick$/$next$"><- OLD DUMPS</a>
           $endif$
+          </div>
+          	   <div id="pnavn">
           &nbsp;&nbsp;
           $if(prev)$
          <a href="/u/$nick$/$prev$">NEW DUMPS -></a>
           $endif$
 
         <br><br>
-</div>
+</div></div>
 
           </div>
 	
@@ -82,7 +83,8 @@
 
 	  <h3>personal info</h3>
 	  <div id="bio" $if(is_home)$class="editable"$endif$>$bio$</div>
-	  <br>
+	  <br><br><br>
+
 	</div>
 
         <div id="footer">