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

2 files changed, 11 insertions, 91 deletions

diff --git a/static/css/profile.css b/static/css/profile.css
index e852d95..d36c828 100755
--- a/static/css/profile.css
+++ b/static/css/profile.css
@@ -33,11 +33,10 @@ letter-spacing:;
 width:auto;
 opacity:0.9;
 	position:fixed;
-	top:45px;
+	top:79px;
 image-rendering: -moz-crisp-edges;
-left:28;
+left:18;
 width:180;
-	margin-top:34px;
 background-color:#fff;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -46,7 +45,6 @@ background-color:#fff;
 	background-position:top;
 	z-index:999;
 	min-height:100px;
-	line-height:1.5;
       }
 #lolbanner{
 position:absolute;
@@ -57,12 +55,11 @@ margin-left:22;
 font-size:15px;
 margin-left:-10px;
 color:#999;
-letter-spacing:-2px;
+letter-spacing:-1px;
 }
 #profile h2{
 text-indent:-10;
 margin-top:-5;
-margin-bottom:15;
 }
 #logavatar{
 margin-left:-49;
@@ -80,8 +77,7 @@ display:inline-block;
 bottom:0;
 margin-left:-5px;
 font-size:12px;
-padding-bottom:10;
-position:absolute;
+
 }
 
 #logavatar img{
@@ -99,8 +95,9 @@ margin-top:0;
 }
 #profile h8{
 position:absolute;
-top:39px;font-size:100%;
+top:30px;font-size:100%;
 letter-spacing:-1px;
+left:12px;
 color:#000;
 }
 #profile h9{
@@ -109,7 +106,7 @@ color:#000;
 text-shadow:#ccc 1px 1px 1px;
 }
 #chatrap{
-margin-left:265px;
+margin-left:250px;
 }
 
 #upload{
@@ -278,8 +275,6 @@ margin-top:20;
 	z-index:4;
 	line-height:20px;
 	text-align: left;
-
-	
 }
       .editable {
          color: #0AA;
@@ -323,7 +318,7 @@ color:#ccc;
 
 
       img#avatarPic {
-         max-height:50px;max-width:50px;
+         max-height:100px;max-width:100px;
 		 border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -336,77 +331,14 @@ color:#ccc;
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
+margin-bottom:15px;
       }
 
-   
-      #newuser
-     {
-	border-top-left-radius:10px;
-	border-top-right-radius:10px;
-	-webkit-border-top-left-radius:10px;
-	-webkit-border-top-right-radius:10px;
-	-moz-border-radius-topleft:10px;
-	-moz-border-radius-topright:10px;
-	border-bottom-left-radius:10px;
-	border-bottom-right-radius:10px;
-	-webkit-border-bottom-left-radius:10px;
-	-webkit-border-bottom-right-radius:10px;
-	-moz-border-radius-bottomleft:10px;
-
-	-moz-border-radius-bottomright:15px;
-border:1px solid black;
-	box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
-  -webkit-box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
-  -moz-box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
-padding:20;
-line-height:1.5;
-height:auto;
-margin-top:-100px;
-     width:600;
-
-	background-image:url(/static/img/hearts.gif);
-margin-left:40}
-
-     #newuser a{font-size:28;
-line-height:3;
-	text-shadow: 1px 1px 1px #000;
-letter-spacing:-1;
-color:#f0e;
-
-
-}
 .logged-dump a:hover {
  text-decoration: none;
  color: #00F;
 }
-#newuser h1{font-size:20;
-letter-spacing:-2;
-color:#fff;
-text-indent:250;	text-shadow: 1px 1px 1px #000;
-display:none;
-text-transform:uppercase;
-
-}
-#newuser h3{font-size:18;
-letter-spacing:-1;
-color:#000;
-	text-shadow: 1px 1px 1px #ccc;
-text-transform:uppercase;
-
-}
-#newuser h2{font-size:35;
-margin-top:-10;
-color:#000;
-	text-shadow: 0px 2px px #f0e;
-text-transform:lowercase;
-letter-spacing:5;
-text-align:center;
 
-}     
-#headerbar{
-top:80;
-	background-image:url(/static/img/welcomebar.gif);
-}
 .invisible { display: none !important; }
 body,td,th {
 	font-family: Arial, Helvetica, sans-serif;
@@ -419,11 +351,7 @@ background-attachment:fixed;
 
 	
 }@charset "UTF-8";
-  
-#headerbar{
-top:80;
-	background-image:url(/static/img/welcomebar.gif);
-}
+
 .invisible { display: none !important; }
 body,td,th {
 	font-family: Arial, Helvetica, sans-serif;
diff --git a/template/profile.st b/template/profile.st
index 862b6d9..3d1a0dc 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -14,19 +14,13 @@
     $banner()$
     <div id="chatrap">  
       <div id="headerbar"></div>
-
       <div id="log">
         <div id="loghead">
         </div>
         <br>
         <div id="posts">
-          
           <div id="cats">
             $if(dumps)$
-            <div id="lolbanner">
-              <img src="/static/img/welcomebanner.gif">
-            </div>
-            
             $dumps:{ d | $profile_dump(dump=d)$ }$
             <div id="profile">
 
@@ -115,9 +109,7 @@ $endif$
 <hr/>
 $share_buttons()$
 </div>
-
 	               <div id="profile">
-
               <h2>$nick$</h2>
 
               $if(isadmin)$
@@ -162,7 +154,7 @@ $share_buttons()$
 
               <br>
               
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
+         <a href="/u/$nick$/favorites"><h7>$nick$'s Favorite Pix</h7></a>     
               
               <div id="date">
                 <div type="text" id="datepicker"></div></div>