aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/java/com/juick/http/www/PageTemplates.java2
-rw-r--r--src/java/com/juick/http/www/UserThread.java2
-rw-r--r--web/style3.css23
3 files changed, 13 insertions, 14 deletions
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index e907efcb1..5032cbf5a 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -55,7 +55,7 @@ public class PageTemplates {
out.println("<html>");
out.println("<head>");
out.println(" <title>" + title + "</title>");
- out.println(" <link rel=\"stylesheet\" href=\"//static.juick.com/style3.2012111100.css\"/>");
+ out.println(" <link rel=\"stylesheet\" href=\"//static.juick.com/style3.2012122600.css\"/>");
out.println(" <link rel=\"icon\" type=\"image/png\" href=\"//static.juick.com/favicon.png\"/>");
out.println(" <script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js\" defer=\"defer\"></script>");
out.println(" <script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js\" defer=\"defer\" async=\"async\"></script>");
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index 5beb6b612..c796767af 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -162,7 +162,7 @@ public class UserThread {
}
out.println(" </li>");
- out.println(" <li class=\"mtoolbar\"><ul>");
+ out.println(" <li id=\"mtoolbar\"><ul>");
out.println(" <li><a href=\"/" + mid + "\"><div style=\"background-position: -64px 0\"></div>" + mid + "</a></li>");
if (visitor != null) {
if (visitor.UID != msg.User.UID) {
diff --git a/web/style3.css b/web/style3.css
index 7a302320e..9b04978d3 100644
--- a/web/style3.css
+++ b/web/style3.css
@@ -4,7 +4,8 @@ html { background: #EEEEE5; color: #000; }
h1,h2 { font-weight: normal; }
ul { list-style-type: none; }
a { text-decoration: none; color: #069; }
-img { border: none; }
+img,hr { border: none; }
+hr { height: 1px; background: #CCC; }
#header, #topwrapper { width: 1000px; margin: 0 auto; }
#content, #footer { width: 600px; margin: 0 auto; }
@@ -14,7 +15,7 @@ img { border: none; }
#hwrapper { width: 100%; background: #333; }
#header { height: 48px; }
#logo { float: left; margin: 3px 0 0 30px; }
-#header a { text-decoration: none; font-size: 18px; }
+#header a { font-size: 18px; }
#search { float: left; margin: 10px 0 0 51px; }
#search .text { width: 285px; padding: 4px; border: none; background: #EEE; }
@@ -49,18 +50,17 @@ img { border: none; }
.msg-txt { margin: 8px 0 8px 58px; overflow: hidden; }
.msg-media { text-align: center; margin: 8px 0 0px 58px; }
.msg-links { font-size: small; margin: 8px 0 0 68px; color: #999; }
-.msg-comments { margin: 10px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid #DDD; color: #AAA; }
+.msg-comments { margin: 8px 0 0 58px; padding: 5px 0 0 10px; overflow: hidden; font-size: small; border-top: 1px solid #DDD; color: #AAA; }
.msg-comment { margin: 8px 0 0 58px; }
.msg-comment textarea { width: 505px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 1px solid #DDD; }
.msg-comment .narrow { width: 450px; }
-.msg-comment input { border: 1px solid #CCC; width: 50px; margin-left: 6px; vertical-align: top; background: #EEE; color: #999; }
+.msg-comment input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px solid #CCC; background: #EEE; color: #999; }
.msg-recomms { margin: 10px 0 0 68px; overflow: hidden; font-size: small; color: #AAA; }
-.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: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; }
+#mtoolbar { width: 600px; margin-left: 1px; background: #E5E5DD; }
+#mtoolbar ul, #mtoolbar a { padding: 5px; }
+#mtoolbar li { display: inline; }
+#mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; }
.newmessage { width: 570px; padding: 2px; resize: vertical; border: 1px solid #DDD; } /* textarea */
@@ -77,10 +77,9 @@ img { border: none; }
/********/
#column { width: 185px; position: absolute; top: 0; padding-top: 10px; overflow: hidden; }
-#column ul,p,hr { margin: 10px 0; }
+#column ul, #column p, #column hr { margin: 10px 0; }
#column li { margin: 6px 0; }
#column p { font-size: small; line-height: 140%; }
-#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; }
@@ -107,5 +106,5 @@ img { border: none; }
/********/
-#footer { clear: both; font-size: small; padding: 15px 0 10px 0; color: #999; }
+#footer { clear: both; font-size: small; padding: 10px 0; color: #999; }
#footer-right { float: right; }