diff options
| author |  Ugnich Anton | 2013-01-04 00:22:09 +0700 |
|---|---|---|
| committer | Ugnich Anton | 2013-01-04 00:22:09 +0700 |
| commit | 6df23a2abefb11b694afc359358a450f704d41bf (patch) | |
| tree | d9f3a7695ba079f88efe79516df0f52391e5d65f | |
| parent | 881bc336c1cef93d08cd1f14e37f3a3feeb07e58 (diff) | |
bugfix
| -rw-r--r-- | src/java/com/juick/http/www/PageTemplates.java | 2 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/UserThread.java | 5 | ||||
| -rw-r--r-- | web/style3.css | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index 080752d1..80b5a22e 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -52,7 +52,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.2013010300.css\"/>"); + out.println(" <link rel=\"stylesheet\" href=\"//static.juick.com/style3.2013010301.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 e0d2a4af..9001bd17 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -279,9 +279,6 @@ public class UserThread { if (msg.ReplyTo == ReplyTo) { out.print(" <li id=\"" + msg.RID + "\" class=\"msg\" style=\""); - if (i == 0) { - out.print("border: 0;"); - } if (margin > 0) { out.print("margin-left: " + margin + "px;"); } @@ -327,7 +324,7 @@ public class UserThread { for (int i = 0; i < replies.size(); i++) { com.juick.Message msg = replies.get(i); - out.print(" <li id=\"" + msg.RID + "\" class=\"msg\"" + (i == 0 ? " style=\"border: 0\"" : "") + ">"); + out.print(" <li id=\"" + msg.RID + "\" class=\"msg\">"); if (msg.AttachmentType != null) { if (msg.AttachmentType.equals("jpg")) { out.println(" <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + ".jpg\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + ".jpg\" alt=\"\"/></a></div>"); diff --git a/web/style3.css b/web/style3.css index e105081e..c79f6a66 100644 --- a/web/style3.css +++ b/web/style3.css @@ -36,8 +36,8 @@ hr { height: 1px; background: #CCC; } #geomap { width: 600px; height: 300px; margin-top: 1em; overflow: hidden; } -.msg { padding: 15px; margin: 8px 0 16px 0; width: 570px; border: 1px solid #EEE; background: #FFF; } -.msgthread { margin-bottom: 0; border-bottom-color: #CCC; } +.msg { padding: 15px; margin: 8px 0 16px 0; width: 570px; background: #FFF; } +.msgthread { margin-bottom: 0; border-bottom: 1px solid #CCC; } .msg-avatar { float: left; height: 1px; overflow: visible; } .msg-avatar img { width: 48px; height: 48px; vertical-align: top; } .msg-ts { float: right; font-size: small; vertical-align: top; } @@ -56,6 +56,7 @@ hr { height: 1px; background: #CCC; } .msg-comment .narrow { width: 450px; } .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; } +blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; } #mtoolbar { width: 600px; margin-left: 1px; background: #E5E5DD; } #mtoolbar ul, #mtoolbar a { padding: 5px; } @@ -135,7 +136,7 @@ hr { height: 1px; background: #CCC; } .msg-header { margin-bottom: 6px; } .msg-ts { clear: both; float: none; margin: 0 0 4px 58px; } .msg-txt { clear: both; margin: 8px 0 0 0; } - .msg-media { overflow: scroll; } + .msg-media { overflow: auto; } .msg-media,.msg-links,.msg-comment,.msg-comments,.msg-recomms { margin-left: 0px; } .title2 h2 { font-size: large; } |