diff options
| -rw-r--r-- | src/java/com/juick/http/www/PageTemplates.java | 4 | ||||
| -rw-r--r-- | web/logo3.png | bin | 1722 -> 1184 bytes | |||
| -rw-r--r-- | web/style3.css | 50 |
3 files changed, 17 insertions, 37 deletions
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index 69fbb5ce..922bc922 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -195,7 +195,7 @@ public class PageTemplates { Utils.finishSQL(rs, stmt); } - out.println("<div id=\"title\"><div id=\"title-container\">"); + out.println("<div id=\"title\">"); out.println(" <div id=\"title-av\"><a href=\"/" + user.UName + "/\"><img src=\"http://i.juick.com/a/" + user.UID + ".png\" width=\"96\" height=\"96\" alt=\"" + user.UName + "\"/></a></div>"); out.println(" <div id=\"title-stats\"><ul>"); out.println(" <li><a href=\"/" + user.UName + "/friends\">" + rb.getString("(Stats) I read") + ": " + iread + "</a></li>"); @@ -204,7 +204,7 @@ public class PageTemplates { out.println(" <li>" + rb.getString("(Stats) Replies") + ": " + replies + "</li>"); out.println(" </ul></div>"); out.println(" <div id=\"title-username\"><h1>" + fullname + "</h1><p>" + description + "</p></div>"); - out.println("</div></div>"); + out.println("</div>"); out.println(); } diff --git a/web/logo3.png b/web/logo3.png Binary files differindex df656d3f..933f6099 100644 --- a/web/logo3.png +++ b/web/logo3.png diff --git a/web/style3.css b/web/style3.css index 372546be..9dc2f247 100644 --- a/web/style3.css +++ b/web/style3.css @@ -1,21 +1,17 @@ -html { margin: 0; padding: 0; font-family: sans-serif; font-size: 16px; } -body { margin: 0; padding: 0; } +html,body,h1,h2,ul,li,form { margin: 0; padding: 0; } +html { font-family: sans-serif; font-size: 16px; } h1,h2 { font-weight: normal; } ul { list-style-type: none; } a { text-decoration: none; } img { border: none; } -form { margin: 0; } -/********/ - -#title-container, #topwrapper { width: 100%; min-width: 1000px; max-width: 1024px; margin: 0 auto; } +#header,#title,#topwrapper { width: 1000px; margin: 0 auto; } /********/ #hwrapper { width: 100%; } -#header { height: 48px; width: 1000px; margin: 0 auto; } +#header { height: 48px; } #logo { float: left; margin: 3px 0 0 30px; } -#header ul { margin: 0; padding: 0; } #header a { text-decoration: none; font-size: 18px; } #search { float: left; margin: 5px 0 0 32px; } @@ -32,15 +28,12 @@ form { margin: 0; } /********/ -#title { display: none; clear: both; width: 100%; border-top: 1px solid; border-bottom: 1px solid; } +#title { display: none; clear: both; width: 100%; } #title>h1 { margin: 20px auto; font-size: 28px; } - -#title-container { margin: 20px auto; min-height: 100px; } #title-av { width: 100px; height: 100px; margin-left: 20px; float: left; } #title-av img { vertical-align: top; padding: 2px; } #title-stats { width: 200px; float: right; border-left: 1px solid; } -#title-stats ul { margin: 10px 0 10px 20px; padding: 0; } -#title-stats li { margin: 0; padding: 0; } +#title-stats ul { margin: 10px 0 10px 20px; } #title-username { margin: 0 220px 0 140px; } /********/ @@ -48,7 +41,6 @@ form { margin: 0; } #topwrapper { position: relative; } #wrapper { width: 100%; float: left; } #content { width: 600px; margin: 0 auto; padding: 0; } -#content ul { list-style-type: none; margin: 0; padding: 0; } #content li { background-repeat: no-repeat; } /********/ @@ -82,29 +74,20 @@ table.users { width: 100%; margin: 10px 0; } table.users td { width: 33%; padding: 6px 0; overflow: hidden; } table.users img { width: 32px; height: 32px; vertical-align: middle; margin-right: 6px; } -#chats li { margin: 16px; } - .title2 { padding: 10px 20px; margin: 20px 0 20px 0; } .title2-right { float: right; line-height: 24px; } -.title2 h2 { margin: 0; font-size: 24px; } - -#gallery { margin: 20px auto; padding: 0; } -.galleryitem { float: left; margin: 0; padding: 0; line-height: 0; } -.galleryitem img { margin: 0 5px 5px 0; } +.title2 h2 { font-size: 24px; } .page { text-align: center; padding: 5px; } /********/ -#column { width: 200px; position: absolute; top: 0px; padding-top: 10px; } -#column ul { margin: 8px 0 0 0; padding: 0; } -#column li { margin: 0; padding: 0; } -#column li a { display: block; padding: 3px 0 3px 10px; } -#column p { font-size: small; margin: 10px 5px 0 10px; line-height: 130%; } -#column hr { height: 1px; border: none; width: 190px; margin: 10px 0 10px 10px;} -#column .inp { width: 185px; border: 1px solid; padding: 3px; border-radius: 3px; } -#column h2 { display: none; border-bottom: 1px solid; font-size: 18px; margin: 24px 0 8px 0; padding: 0 2px 2px 2px; } -#column h2>a { float: right; } +#column { width: 185px; position: absolute; top: 0; padding-top: 10px; } +#column ul,p,hr { margin: 10px 0; } +#column li { margin: 6px 0; } +#column p { font-size: small; line-height: 140%; } +#column hr { height: 1px; border: none; } +#column .inp { width: 180px; border: 1px solid; padding: 3px; border-radius: 3px; } /********/ @@ -112,7 +95,7 @@ table.users img { width: 32px; height: 32px; vertical-align: middle; margin-righ /********/ -#footer { clear: both; width: 590px; margin: 0 auto; font-size: small; padding: 15px 0 10px 0; } +#footer { clear: both; width: 600px; margin: 0 auto; font-size: small; padding: 15px 0 10px 0; } #footer-right { float: right; } /******************************************************************************/ @@ -122,13 +105,12 @@ a { color: #069; } #hwrapper { background: #333; } #header a { color: #AAA; } #header li a:hover { background: #444; } -#title { border-color: #CCC; background: #F0F0F0; } +#title { background: #F0F0F0; } #nav-menu { background: #DDD; } #title-stats { border-color: #CCC; } #search .text { border: none; background-color: #EEE; } #search .submit { border: none; background-color: #DDD; } -#content { } #filters { border-color: #CCC; } #filters a { color: #999; } #content .msg { background: #FFF; border-color: #EEE; } @@ -144,8 +126,6 @@ a { color: #069; } .title2 { background: #DDDDD0; } .page { background: #E5E5DD; } -#column li:hover { background: #D0E0EE; } -#column h2 { border-color: #CCC; } #column hr { background-color: #CCC; } #column .inp { border-color: #CCC; background: #F5F5E9; } |
