From 855a455fdfb068406d18e57e3c6e143fb862c5dd Mon Sep 17 00:00:00 2001 From: the_mgt Date: Wed, 18 May 2011 21:25:17 +0200 Subject: [PATCH] Ported blockquote changes to Tinymce css, so it looks alike when you edit a message with citations. Also left a note in message.css that both files are connected. --- webcit/static/styles/message.css | 5 ++++- webcit/static/styles/webcit-tinymce.css | 8 +------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/webcit/static/styles/message.css b/webcit/static/styles/message.css index c3060c6b3..d5b959138 100644 --- a/webcit/static/styles/message.css +++ b/webcit/static/styles/message.css @@ -75,8 +75,9 @@ margin-left: 0.3em; } -/* make blockquotes in messages distingushable */ +/* Blockquotes in messages need to be distingushable */ /* there is a lot of cascading happen io order to make it look beautiful */ +/* if you make changes here, port them to WEBCIT-TINYMCE.css! */ .message_content blockquote { border: 1px solid #5C646B; border-radius: 8px; @@ -106,6 +107,8 @@ blockquote .message_content { behavior: url(/static/styles/PIE.htc); background-color: #deded0; } +/* --- End of blockquoting block --- */ + .message img { max-width: 700px; diff --git a/webcit/static/styles/webcit-tinymce.css b/webcit/static/styles/webcit-tinymce.css index 9819ff341..ac3f353c5 100644 --- a/webcit/static/styles/webcit-tinymce.css +++ b/webcit/static/styles/webcit-tinymce.css @@ -68,7 +68,6 @@ blockquote{ /* there is a lot of cascading happen io order to make it look beautiful */ .message_content blockquote { border: 1px solid #5C646B; - border-top: 0px; border-radius: 8px; -webkit-border-radius: 8px; -moz-border-radius: 8px; @@ -78,14 +77,9 @@ blockquote{ behavior: url(/static/styles/PIE.htc); } -/*remove top border of blockquote INSIDE of blockquotes*/ -.message_content blockquote blockquote { - border-top: none; -} - /*but draw a top border if message inside blockquote was quoted with header!*/ blockquote .message_header { - border-top: 1px solid #5C646B; + border-top: 1px solid transparent; border-radius: 8px 8px 0px 0px; -webkit-border-radius: 8px 8px 0px 0px; -moz-border-radius: 8px 8px 0px 0px; -- 2.30.2