Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/webcit/static/styles/message.css b/webcit/static/styles/message.css
index 600b9d41747fa350fb2a6b7a58b15032eefd5c18..875a7e1accb8aaefac562bddd9aa2ebb78328870 100644 (file)
--- a/webcit/static/styles/message.css
+++ b/webcit/static/styles/message.css
@@ -67,7 +67,8 @@
 /* if you make changes here, port them to WEBCIT-TINYMCE.css! */
 .message_content blockquote {
        /*border: 1px solid #5C646B;*/
-       padding: 0.3em;
+       padding: 0.2em;
+       margin: 0.3em 0.5em;
 }
 
 .message_content blockquote .message_header span {
@@ -89,6 +90,7 @@ blockquote .message_header {
 blockquote .message_content {
        padding: 0;
        background-color: transparent;
+       margin: 0.3em;
 }
 /* --- End of blockquoting block --- */
 

diff --git a/webcit/static/styles/webcit-tinymce.css b/webcit/static/styles/webcit-tinymce.css
index 18b6ceade3e4407a0436966f8fe8da934230d73a..70cecf0dff0301dd98e660784e1582dd3b638ed4 100644 (file)
--- a/webcit/static/styles/webcit-tinymce.css
+++ b/webcit/static/styles/webcit-tinymce.css
@@ -3,21 +3,17 @@ body {font-size: 12px;}
 
 blockquote{
        background-color: #deded0;
-       border: 1px solid #5C646B;
-       border-top: none;
 }
 
 .message_header {
        font-size: x-small;
        padding: 0.5em;
-        border-top: 1px solid transparent;
 }
 
 .message_content {
        background-color: #fff;
        padding: 0.5em;
        clear: both;
-       border-bottom: 1px solid transparent;
 }
 
 
@@ -52,11 +48,10 @@ blockquote{
 /* make blockquotes in messages distingushable */
 /* there is a lot of cascading happen io order to make it look beautiful */
 .message_content blockquote {
-       /*border: 1px solid #5C646B;*/
-       padding: 0.3em;
+       padding: 0.2em;
+       margin: 0.3em 0.5em;
 }
 
-/*but draw a top border if message inside blockquote was quoted with header!*/
 blockquote .message_header {          
        padding: 0;
        background-color: #deded0;
@@ -71,7 +66,6 @@ blockquote .message_header {
        float: none;
 }
 
-/*make bottom border of content inside of a blockquote rounded, so it fits the blockquote*/
 blockquote .message_content {
        padding: 0;
        background-color: transparent;