CSS optimization

3 files changed, 42 insertions, 78 deletions

diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Blogs.java
index 3260a2cb..0250a157 100644
--- a/src/java/com/juick/http/www/Blogs.java
+++ b/src/java/com/juick/http/www/Blogs.java
@@ -135,7 +135,7 @@ public class Blogs {
             out.println("<div id=\"wrapper\">");
             out.println("<div id=\"content\">");
 
-            PageTemplates.pageFilters(out, locale, visitor);
+            //PageTemplates.pageFilters(out, locale, visitor);
 
             if (mids.size() > 0) {
                 /*
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 10b372a0..e907efcb 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -89,21 +89,22 @@ public class PageTemplates {
         out.println("</div>");
         out.println("</div>");
     }
-
+    /*
     public static void pageFilters(PrintWriter out, Locale loc, com.juick.User user) {
-        ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
-
-        out.println("<div id=\"filters\">");
-        out.println("<ul>");
-        out.println("  <li><a href=\"#\">Messages</a></li>");
-        out.println("  <li><a href=\"#\">Photos</a></li>");
-        out.println("  <li><a href=\"#\">Recommendations</a></li>");
-        out.println("  <li><a href=\"#\">Private</a></li>");
-        out.println("  <li><a href=\"#\">Tags</a></li>");
-        out.println("  <li><a href=\"#\">Users</a></li>");
-        out.println("</ul>");
-        out.println("</div>");
+    ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
+    
+    out.println("<div id=\"filters\">");
+    out.println("<ul>");
+    out.println("  <li><a href=\"#\">Messages</a></li>");
+    out.println("  <li><a href=\"#\">Photos</a></li>");
+    out.println("  <li><a href=\"#\">Recommendations</a></li>");
+    out.println("  <li><a href=\"#\">Private</a></li>");
+    out.println("  <li><a href=\"#\">Tags</a></li>");
+    out.println("  <li><a href=\"#\">Users</a></li>");
+    out.println("</ul>");
+    out.println("</div>");
     }
+     */
 
     public static void pageUserTitle(PrintWriter out, Connection sql, Locale loc, com.juick.User user, com.juick.User visitor) {
         ResourceBundle rb = ResourceBundle.getBundle("User", loc);
diff --git a/web/style3.css b/web/style3.css
index d04c5487..fcc3c718 100644
--- a/web/style3.css
+++ b/web/style3.css
@@ -1,25 +1,27 @@
 html,body,h1,h2,ul,li,form,input,textarea { margin: 0; padding: 0; }
 html,input { font-family: sans-serif; font-size: 12pt; }
+html { background: #EEEEE5; color: #000; }
 h1,h2 { font-weight: normal; }
 ul { list-style-type: none; }
-a { text-decoration: none; }
+a { text-decoration: none; color: #069; }
 img { border: none; }
 
-#header,#title,#topwrapper { width: 1000px; margin: 0 auto; }
+#header,#topwrapper { width: 1000px; margin: 0 auto; }
 
 /********/
 
-#hwrapper { width: 100%; }
+#hwrapper { width: 100%; background: #333; }
 #header { height: 48px; }
 #logo { float: left; margin: 3px 0 0 30px; }
 #header a { text-decoration: none; font-size: 18px; }
 
 #search { float: left; margin: 10px 0 0 51px; }
-#search .text { width: 285px; padding: 4px; border-radius: 2px; }
+#search .text { width: 285px; padding: 4px; border: none; background: #EEE; }
 
 #nav-right { float: right; }
 #nav-right li { float: left; }
-#nav-right a { display: block; line-height: 48px; padding: 0 15px; }
+#nav-right a { display: block; line-height: 48px; padding: 0 15px; color: #AAA; }
+#nav-right a:hover { background: #444; }
 #nav-right .wide { padding: 0 20px; }
 #nav-right img { max-width: 32px; max-height: 32px; vertical-align: middle; margin: 0 4px 0 0; }
 #nav-right .ico24 { width: 24px; height: 24px; background: url(//static.juick.com/icons24.png) no-repeat; padding: 12px 0; }
@@ -33,49 +35,45 @@ img { border: none; }
 
 /********/
 
-#filters { display: none; margin: 15px 0; border-bottom: 1px solid; padding: 10px 0; }
-#filters li { display: inline; margin-right: 10px; }
-
-/********/
-
 #geomap { margin-top: 1em; width: 570px; height: 360px; overflow: hidden; }
 
-#content .msg { padding: 15px; margin: 8px 0 16px 0; width: 570px; border: 1px solid; }
-#content .msgthread { margin-bottom: 0; }
+#content .msg { padding: 15px; margin: 8px 0 16px 0; width: 570px; border: 1px solid #EEE; background: #FFF; }
+#content .msgthread { margin-bottom: 0; border-bottom-color: #CCC; }
 #content .msg-avatar { float: left; }
 #content .msg-avatar img { width: 48px; height: 48px; vertical-align: top; }
 #content .msg-ts { float: right; font-size: small; vertical-align: top; }
+#content .msg-ts, .msg-ts>a { color: #999; }
 #content .msg-menu { margin: 0 0 0 6px; padding: 2px 0; }
 #content .msg-menu img { vertical-align: top; }
 #content .msg-header { margin-left: 58px; overflow: hidden; }
-#content .msg-place { font-size: small; margin: 8px 0 8px 58px; }
+#content .msg-place { font-size: small; margin: 8px 0 8px 58px; color: #999; }
 #content .msg-txt { margin: 8px 0 8px 58px; overflow: hidden; }
 #content .msg-media { text-align: center; margin: 8px 0 0px 58px; }
-#content .msg-links { font-size: small; margin: 8px 0 0 68px; }
-#content .msg-comments { margin: 10px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid; }
+#content .msg-links { font-size: small; margin: 8px 0 0 68px; color: #999; }
+#content .msg-comments { margin: 10px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid #DDD; color: #AAA; }
 #content .msg-comment { margin: 8px 0 0 58px; }
-#content .msg-comment textarea { border: 1px solid; width: 505px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; }
+#content .msg-comment textarea { width: 505px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 1px solid #DDD; }
 #content .msg-comment textarea.narrow { width: 450px; }
-#content .msg-comment input { border: 1px solid; width: 50px; margin-left: 6px; vertical-align: top; }
-#content .msg-recomms { margin: 10px 0 0 68px; overflow: hidden; font-size: small; }
+#content .msg-comment input { border: 1px solid #CCC; width: 50px; margin-left: 6px; vertical-align: top; background: #EEE; color: #999; }
+#content .msg-recomms { margin: 10px 0 0 68px; overflow: hidden; font-size: small; color: #AAA; }
 
-.mtoolbar { width: 600px; margin-left: 1px; }
+.mtoolbar { width: 600px; margin-left: 1px; background: #E5E5DD; }
 .mtoolbar ul { padding: 5px; }
 .mtoolbar li { display: inline; }
 .mtoolbar a { padding: 5px; }
-.mtoolbar div { display: inline-block; width: 16px; height: 16px; background-image: url(//static.juick.com/toolbar-icons.png); background-repeat: no-repeat; vertical-align: middle; margin: 5px; }
+.mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; }
 
-#content textarea.newmessage { border: 1px solid; width: 570px; padding: 2px; resize: vertical; }
+#content textarea.newmessage { width: 570px; padding: 2px; resize: vertical; border: 1px solid #DDD; }
 
 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; }
 
-.title2 { padding: 10px 20px; margin: 20px 0; }
+.title2 { padding: 10px 20px; margin: 20px 0; background: #DDDDD0; }
 .title2-right { float: right; line-height: 24px; }
 .title2 h2 { font-size: 24px; }
 
-.page { text-align: center; padding: 5px; }
+.page { text-align: center; padding: 5px; background: #E5E5DD; }
 
 /********/
 
@@ -83,14 +81,14 @@ table.users img { width: 32px; height: 32px; vertical-align: middle; margin-righ
 #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: 175px; border: 1px solid; padding: 3px; border-radius: 3px; }
+#column hr { height: 1px; border: none; background: #CCC; }
+#column .inp { width: 175px; padding: 3px; border: 1px solid #CCC; border-radius: 3px; background: #F5F5E9; }
 #ctitle { font-size: 14pt; }
 #ctitle img { vertical-align: middle; margin-right: 5px; }
-#ctoolbar { margin: 10px 0; padding: 5px; line-height: 0; }
+#ctoolbar { margin: 10px 0; padding: 5px; line-height: 0; background: #E5E5DD; }
 #ctoolbar li { display: inline; }
 #ctoolbar a { padding: 5px 10px;}
-#ctoolbar div { display: inline-block; width: 16px; height: 16px; background-image: url(//static.juick.com/toolbar-icons.png); background-repeat: no-repeat; vertical-align: middle; margin: 5px 0; }
+#ctoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px 0; }
 #ustats li { margin: 3px 0; font-size: smaller; }
 
 /********/
@@ -103,47 +101,12 @@ table.users img { width: 32px; height: 32px; vertical-align: middle; margin-righ
 #dialogw { display: none; position: fixed; top: 40%; left: 30%; width: 350px; padding: 20px; background: #EEEEE5; border: 1px solid #999; }
 #dialogl,#dialogn { padding: 5px; margin: 3px 0 20px; border: 1px solid #DDD; background: #F5F5E9; }
 #dialogw li { float: left; margin: 5px 10px 0 0; }
-#dialogw li>a { display: block; width: 32px; height: 32px; background-image: url(//static.juick.com/sharesocial.png); }
+#dialogw li>a { display: block; width: 32px; height: 32px; background: url(//static.juick.com/sharesocial.png); }
 #sharetw { background-position: -32px 0; }
 #sharevk { background-position: -64px 0; }
 #sharegp { background-position: -96px 0; }
 
 /********/
 
-#footer { clear: both; width: 600px; 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; color: #999; }
 #footer-right { float: right; }
-
-/******************************************************************************/
-
-html { background: #EEEEE5; color: #000; }
-a { color: #069; }
-#hwrapper { background: #333; }
-#nav-right a { color: #AAA; }
-#nav-right a:hover { background: #444; }
-#title { background: #F0F0F0; }
-#title-stats { border-color: #CCC; }
-#search .text { border: none; background-color: #EEE; }
-
-#filters { border-color: #CCC; }
-#filters a { color: #999; }
-#content .msg { background: #FFF; border-color: #EEE; }
-#content .msgthread { border-bottom-color: #CCC; }
-#content .msg-place { color: #999; }
-#content .msg-comments { color: #AAA; border-color: #DDD; }
-#content .msg-ts, .msg-ts>a { color: #999; }
-#content .msg-links { color: #999; }
-#content .msg-comment textarea { border-color: #DDD; }
-#content .msg-comment input { border-color: #CCC; background-color: #EEE; color: #999; }
-#content .msg-recomms { color: #AAA; }
-.mtoolbar { background-color: #E5E5DD; }
-
-#content textarea.newmessage { border-color: #DDD; }
-
-.title2 { background: #DDDDD0; }
-.page { background: #E5E5DD; }
-
-#column hr { background-color: #CCC; }
-#column .inp { border-color: #CCC; background: #F5F5E9; }
-#ctoolbar { background-color: #E5E5DD; }
-
-#footer { color: #999; }