From 922a12eac92b6b6e0367482351328eb8d5133249 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 2 Dec 2015 13:22:56 +0300
Subject: blockquote should not be inside p, using q instead

---
 src/main/java/com/juick/http/www/PageTemplates.java | 4 ++--
 src/main/webapp/style.css                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java
index bb4a6e47..bc48d352 100644
--- a/src/main/java/com/juick/http/www/PageTemplates.java
+++ b/src/main/java/com/juick/http/www/PageTemplates.java
@@ -487,8 +487,8 @@ public class PageTemplates {
         msg = sb.toString();
 
         // > citate
-        msg = msg.replaceAll("(?:(?<=\\n)|(?<=\\A))&gt; *(.*)?(\\n|(?=\\Z))", "<blockquote>$1</blockquote>");
-        msg = msg.replaceAll("</blockquote><blockquote>", "\n");
+        msg = msg.replaceAll("(?:(?<=\\n)|(?<=\\A))&gt; *(.*)?(\\n|(?=\\Z))", "<q>$1</q>");
+        msg = msg.replaceAll("</q><q>", "\n");
 
         msg = msg.replaceAll("\n", "<br/>\n");
         return msg;
diff --git a/src/main/webapp/style.css b/src/main/webapp/style.css
index ebc91570..60df1415 100644
--- a/src/main/webapp/style.css
+++ b/src/main/webapp/style.css
@@ -111,7 +111,7 @@ article input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px
 .msg-comment input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px solid #CCC; background: #EEE; color: #999; }
 .msg-recomms { margin-top: 10px; overflow: hidden; font-size: small; color: #AAA; text-indent: 10px; }
 .reply-new .msg-cont { border-right: 5px solid #0C0; }
-blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; }
+q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; display: inline-block; }
 
 #mtoolbar { width: 670px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; }
 #mtoolbar ul, #mtoolbar a { padding: 5px; }
-- 
cgit v1.2.3