From a5a1249d008074dc454d474e8e163d9391feca74 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Thu, 3 Jun 2004 01:58:44 +0000 Subject: [PATCH] Bug #245196 --> add color borders to quoted message parts. git-svn-id: svn://10.0.0.236/trunk@157347 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mail/base/skin/jar.mn | 1 + mozilla/mail/base/skin/messageBody.css | 15 +---- mozilla/mail/base/skin/messageQuotes.css | 60 +++++++++++++++++++ .../compose/content/MsgComposeCommands.js | 5 ++ 4 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 mozilla/mail/base/skin/messageQuotes.css diff --git a/mozilla/mail/base/skin/jar.mn b/mozilla/mail/base/skin/jar.mn index e7558b9f1e2..25058987005 100644 --- a/mozilla/mail/base/skin/jar.mn +++ b/mozilla/mail/base/skin/jar.mn @@ -8,6 +8,7 @@ classic.jar: + skin/classic/messenger/accountCentral.css (accountCentral.css) + skin/classic/messenger/messageHeader.css (messageHeader.css) + skin/classic/messenger/messageBody.css (messageBody.css) + skin/classic/messenger/messageQuotes.css (messageQuotes.css) + skin/classic/messenger/mailWindow1.css (mailWindow1.css) + skin/classic/messenger/junkMail.css (junkMail.css) + skin/classic/messenger/folderMenus.css (folderMenus.css) diff --git a/mozilla/mail/base/skin/messageBody.css b/mozilla/mail/base/skin/messageBody.css index 8d52664a1ad..29fb142cf19 100644 --- a/mozilla/mail/base/skin/messageBody.css +++ b/mozilla/mail/base/skin/messageBody.css @@ -40,6 +40,7 @@ ======================================================================= */ @import url(chrome://communicator/skin/smileys.css); +@import url(chrome://messenger/skin/messageQuotes.css); /* XXX Breaks the HTML rules below (.moz-class stuff), at least on Linux. "html|.class" doesn't work. @@ -136,19 +137,6 @@ span.moz-txt-formfeed { height: 100%; } - -/* ::::: signature ::::: */ - -.moz-txt-sig, -.moz-signature { - color: gray; -} - -.moz-txt-sig > a, -.moz-signature > a { - color: #7777FF; /* light blue */ -} - /* ::::: vcard ::::: */ .moz-vcard-table { @@ -181,3 +169,4 @@ span.moz-txt-formfeed { .moz-vcard-badge:focus { -moz-outline: none; } + diff --git a/mozilla/mail/base/skin/messageQuotes.css b/mozilla/mail/base/skin/messageQuotes.css new file mode 100644 index 00000000000..db637f1c41a --- /dev/null +++ b/mozilla/mail/base/skin/messageQuotes.css @@ -0,0 +1,60 @@ +/* ===== messageQuotes.css ================================================= + == Shared styles such as block quote colors and signature style + == between the message body during + == message display and the mail editor instance for mail compose. + ======================================================================= */ + +/* ::::: signature ::::: */ + +.moz-txt-sig, +.moz-signature { + color: gray; +} + +.moz-txt-sig > a, +.moz-signature > a { + color: #7777FF; /* light blue */ +} + +/* ::::: colorize block quote borders. We only go 7 levels deep ::::: */ + +blockquote[type=cite] { + padding: 0em .5em .5em 1em !important; + border-right: medium double #0000ff !important; + border-left: medium double #0000ff !important; +} + +blockquote[type=cite] blockquote { + border-right: medium double teal !important; + border-left: medium double teal !important; +} + +blockquote[type=cite] blockquote blockquote { + border-right: medium double maroon !important; + border-left: medium double maroon !important; +} + +blockquote[type=cite] blockquote blockquote blockquote { + border-right: medium double purple !important; + border-left: medium double purple !important; +} + +blockquote[type=cite] blockquote blockquote blockquote blockquote { + border-right: medium double #00CC00 !important; + border-left: medium double #00CC00 !important; +} + +blockquote[type=cite] blockquote blockquote blockquote blockquote blockquote { + border-right: medium double #ee00bb !important; + border-left: medium double #ee00bb !important; +} + +blockquote[type=cite] blockquote blockquote blockquote blockquote blockquote blockquote { + border-right: medium double navy !important; + border-left: medium double navy !important; +} + +blockquote[type=cite] blockquote blockquote blockquote blockquote blockquote blockquote blockquote + border-right: medium double #00eecc !important; + border-left: medium double #00eecc !important; +} diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js index 7e303c73569..d20f8effab3 100644 --- a/mozilla/mail/components/compose/content/MsgComposeCommands.js +++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js @@ -1261,6 +1261,7 @@ function ComposeStartup(recycled, aParams) dump("Failed to get editor element!\n"); return; } + document.getElementById("returnReceiptMenu").setAttribute('checked', gMsgCompose.compFields.returnReceipt); document.getElementById("cmd_attachVCard").setAttribute('checked', @@ -1386,7 +1387,11 @@ var gMsgEditorCreationObserver = { var editor = GetCurrentEditor(); if (editor && GetCurrentCommandManager() == aSubject) + { + var editorStyle = editor.QueryInterface(Components.interfaces.nsIEditorStyleSheets); + editorStyle.addStyleSheet("chrome://messenger/skin/messageQuotes.css"); gMsgCompose.initEditor(editor, window.content); + } } } }