From bce13671b2501c1650c7a9dda725618f47647aed Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Tue, 27 Mar 2001 06:09:35 +0000 Subject: [PATCH] Bug #73412 --> land new message display code. r=hewitt sr=sspitzer git-svn-id: svn://10.0.0.236/trunk@90487 18797224-902f-48f8-a5cc-f745e15eee43 --- .../messenger/mac/msgHdrViewOverlay.css | 115 ++++++++++++--- .../messenger/win/msgHdrViewOverlay.css | 138 +++++++++++++----- .../modern/messenger/msgHdrViewOverlay.css | 87 ++++++++--- 3 files changed, 256 insertions(+), 84 deletions(-) diff --git a/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css b/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css index d29f1ec8aaf..120121ddb43 100644 --- a/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css +++ b/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css @@ -16,14 +16,16 @@ The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights Reserved. -*/ - - -/* These are the style attributes we are applying to the message header - * view overlay which shows the message headers for a selected message. - * some of this stuff originated from mailheaders.css + * + * Contributor(s): + * Scott MacGregor (mscott@netscape.com) + * Joe Hewitt (hewitt@netscape.com) */ +/* ===== msgHdrViewOverlay.css ========================================== + == Styles for the header toolbars of a mail message. + ======================================================================= */ + @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */ @@ -32,17 +34,9 @@ mail-emailaddress { display: -moz-xul-inline-box; } -[hide] { - visibility: collapse; -} - .buttonTopSpacer { height: .3em; } .buttonSpacer { width: .5em; } .headerBox { overflow: hidden; min-width:50px;} -.header-part1 { background-color: #EEEEEE; border: none; } -.header-part2 { background-color: #CCCCCC; border: none; } -.header-part3 { background-color: #CCCCCC; border: none; } - .headerValueBox { width: 7.7em; text-align: right;} #addToAddressBookButton { @@ -66,21 +60,100 @@ mail-emailaddress { color: blue; text-decoration: underline; cursor: pointer; - max-height: 15px; + max-height: 16px; + min-height: 16px; } .showMoreAddressesButton { - list-style-image: url("chrome://messenger/skin/more.gif"); - display: inline; + list-style-image : url("chrome://global/skin/twisty-closed.gif"); } .showFewerAddressesButton { - list-style-image: url("chrome://messenger/skin/less.gif"); - display: inline; + list-style-image : url("chrome://global/skin/twisty-open.gif"); } html.headerValue { white-space: normal; min-width: 50px; margin: 0px;} html.subjectvalue {font-weight: bold;} -text.headerdisplayname { font-weight: bold; margin-right: .5em; margin-left: .5em; min-height: 18px } -text.headerValue { white-space: normal; min-width: 50px; } +text.subjectvalue + { + font-weight: bold; + } + +text.headerdisplayname + { + font-weight : bold; + margin-right : 0.5em; + margin-left : 0.5em; + max-height: 16px; + min-height: 16px; + } + +text.headerValue + { + white-space : normal; + min-width : 50px; + } + + +#msgHeaderView + { + border-left : none; + border-right : none; + } + +.expandHeaderViewButton { + list-style-image: url("chrome://global/skin/twisty-open.gif"); + margin-left: .5em; + margin-right: .5em; +} + +.collapsedHeaderViewButton +{ + list-style-image: url("chrome://global/skin/twisty-closed.gif"); + margin-left: .5em; +} + + +/* ::::: collapsed view styles ::::: */ +.collapsedToggleHdrBox +{ + vertical-align: middle; +} + +#collapsedAttachmentBox { + text-align: center; +} +#collapseddateValue +{ + margin-left: .7em; +} + +#collapsedfromBox +{ + width: 18em +} + +#collapseddateBox +{ + width: 12em +} + +text.collapsedHeaderDisplayName +{ + font-weight: bold; + margin-left: .7em; + max-height: 16px; + min-height: 16px; +} + +.collapsedAttachmentButton +{ + list-style-image: url("chrome://messenger/skin/message-mail-attach.gif"); + margin-right: .5em; + margin-left: .1em; +} + +[hide] { + visibility: hidden; +} diff --git a/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css b/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css index fe5105b8643..484cb6d3525 100644 --- a/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css +++ b/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css @@ -1,29 +1,31 @@ /* -The contents of this file are subject to the Netscape Public -License Version 1.1 (the "License"); you may not use this file -except in compliance with the License. You may obtain a copy of -the License at http://www.mozilla.org/NPL/ - -Software distributed under the License is distributed on an "AS -IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -implied. See the License for the specific language governing -rights and limitations under the License. - -The Original Code is Mozilla Communicator client code, released -March 31, 1998. - -The Initial Developer of the Original Code is Netscape -Communications Corporation. Portions created by Netscape are - Copyright (C) 1998-1999 Netscape Communications Corporation. All -Rights Reserved. -*/ - - -/* These are the style attributes we are applying to the message header - * view overlay which shows the message headers for a selected message. - * some of this stuff originated from mailheaders.css + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is Mozilla Communicator client code, released + * March 31, 1998. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998-2001 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * Scott MacGregor (mscott@netscape.com) + * Joe Hewitt (hewitt@netscape.com) */ +/* ===== msgHdrViewOverlay.css ========================================== + == Styles for the header toolbars of a mail message. + ======================================================================= */ + @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */ @@ -71,7 +73,7 @@ mail-emailaddress .emailDisplayImage { - align : right; + text-align: right; } .emailDisplayButton @@ -79,20 +81,19 @@ mail-emailaddress color : blue; text-decoration : underline; cursor : pointer; - max-height : 15px; + max-height: 16px; + min-height: 16px; } .showMoreAddressesButton - { - list-style-image : url("chrome://messenger/skin/more.gif"); - display : inline; - } +{ + list-style-image : url("chrome://global/skin/twisty-closed.gif"); +} .showFewerAddressesButton - { - list-style-image : url("chrome://messenger/skin/less.gif"); - display : inline; - } +{ + list-style-image : url("chrome://global/skin/twisty-open.gif"); +} html.headerValue { @@ -106,12 +107,18 @@ html.subjectvalue font-weight : bold; } +text.subjectvalue + { + font-weight: bold; + } + text.headerdisplayname { font-weight : bold; margin-right : 0.5em; margin-left : 0.5em; - min-height : 18px + max-height: 16px; + min-height: 16px; } text.headerValue @@ -125,9 +132,60 @@ text.headerValue border-left : none; border-right : none; } - -#headerPart1 - { - background-image : url("chrome://global/skin/scrollbar-slider-bg.gif"); - } - + +.expandHeaderViewButton { + list-style-image: url("chrome://global/skin/twisty-open.gif"); + margin-left: .5em; + margin-right: .5em; +} + +.collapsedHeaderViewButton +{ + list-style-image: url("chrome://global/skin/twisty-closed.gif"); + margin-left: .5em; +} + + +/* ::::: collapsed view styles ::::: */ +.collapsedToggleHdrBox +{ + vertical-align: middle; +} + +#collapsedAttachmentBox { + text-align: center; +} + +#collapseddateValue +{ + margin-left: .7em; +} + +#collapsedfromBox +{ + width: 18em; +} + +#collapseddateBox +{ + width: 12em; +} + +text.collapsedHeaderDisplayName +{ + font-weight: bold; + margin-left: .7em; + max-height: 16px; + min-height: 16px; +} + +.collapsedAttachmentButton +{ + list-style-image: url("chrome://messenger/skin/message-mail-attach.gif"); + margin-right: .5em; + margin-left: 1em; +} + +[hide] { + visibility: hidden; +} diff --git a/mozilla/themes/modern/messenger/msgHdrViewOverlay.css b/mozilla/themes/modern/messenger/msgHdrViewOverlay.css index e0041b0cf46..c876e358e85 100644 --- a/mozilla/themes/modern/messenger/msgHdrViewOverlay.css +++ b/mozilla/themes/modern/messenger/msgHdrViewOverlay.css @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Scott MacGregor (mscott@netscape.com) * Joe Hewitt (hewitt@netscape.com) */ @@ -33,25 +34,11 @@ border-bottom: 1px solid #000000; } -#msgHeaderView > toolbar > .toolbar-holder { - border: none; -} - .header-part1 { background-color: #EEEEEE; color: #000000; } -.header-part2 { - background-color: #C2D0D0; - color: #000000; -} - -.header-part3 { - background-color: #C2D0D0; - color: #000000; -} - .headerValueBox { width: 7.7em; text-align: right; @@ -66,7 +53,7 @@ /* ::::: msg header captions ::::: */ -.headerBox { +.headerBox { overflow: hidden; min-width: 50px; } @@ -86,10 +73,15 @@ html.subjectvalue { font-weight: bold; } +text.subjectvalue { + font-weight: bold; +} + text.headerdisplayname { margin-right: .5em; margin-left: .5em; - min-height: 18px; + max-height: 16px; + min-height: 16px; font-weight: bold; } @@ -102,7 +94,8 @@ mail-emailaddress { .emailDisplayButton { cursor: pointer; - max-height: 15px; + max-height: 16px; + min-height: 16px; color: blue; text-decoration: underline; } @@ -114,19 +107,15 @@ mail-emailaddress { /* ::::: email address twisty ::::: */ .showMoreAddressesButton { - list-style-image: url("chrome://messenger/skin/icons/twisty-more.gif"); + list-style-image: url("chrome://global/skin/tree/twisty-clsd.gif"); } .showFewerAddressesButton { - list-style-image: url("chrome://messenger/skin/icons/twisty-less.gif"); + list-style-image: url("chrome://global/skin/tree/twisty-open.gif"); } /* ::::: miscellaneous ::::: */ -[hide] { - visibility: collapse; -} - .buttonTopSpacer { height: .3em; } @@ -134,3 +123,55 @@ mail-emailaddress { .buttonSpacer { width: .5em; } + +/* ::::: view expand and collapse twisties ::::: */ + +.expandHeaderViewButton { + list-style-image: url("chrome://global/skin/tree/twisty-open.gif"); + margin-left: .5em; + margin-right: .5em; +} + +.collapsedHeaderViewButton { + list-style-image: url("chrome://global/skin/tree/twisty-clsd.gif"); + margin-left: .5em; +} + +/* ::::: collapsed view styles ::::: */ + +.collapsedToggleHdrBox { + vertical-align: middle; +} + +#collapsedAttachmentBox { + text-align: center; +} + +#collapseddateValue { + margin-left: .7em; +} + +#collapsedfromBox { + width: 18em; +} + +#collapseddateBox { + width: 12em; +} + +text.collapsedHeaderDisplayName { + font-weight: bold; + margin-left: .7em; + max-height: 16px; + min-height: 16px; +} + +.collapsedAttachmentButton { + list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif"); + margin-right: .5em; + margin-left: 1em; +} + +[hide] { + visibility: hidden; +}