From e68e2f2b2fe85b417aa3d2db5e1087b173d0166e Mon Sep 17 00:00:00 2001 From: robert Date: Sat, 28 Jan 2006 17:09:37 +0000 Subject: [PATCH] sync with classic development and prepare 1.8 release --- EarlyBlue/communicator/communicator.css | 20 +++++++- .../communicator/icons/autoscroll-ew.gif | Bin 0 -> 148 bytes .../communicator/icons/autoscroll-ns.gif | Bin 0 -> 137 bytes EarlyBlue/communicator/icons/autoscroll.gif | Bin 0 -> 162 bytes EarlyBlue/contents.rdf | 44 +++++++++--------- EarlyBlue/global/autocomplete.css | 4 +- EarlyBlue/global/browser.css | 17 ++++++- EarlyBlue/global/global.css | 6 ++- EarlyBlue/global/globalBindings.xml | 11 +++++ EarlyBlue/global/icons/tab-drag-indicator.gif | Bin 0 -> 76 bytes EarlyBlue/global/menulist.css | 22 +++++---- EarlyBlue/global/netError.css | 5 ++ EarlyBlue/global/scrollbars.css | 1 + EarlyBlue/global/splitter.css | 4 +- EarlyBlue/messenger/filterDialog.css | 4 ++ EarlyBlue/messenger/mailWindow1.css | 21 +++++++-- .../messengercompose/messengercompose.css | 27 ++++------- 17 files changed, 126 insertions(+), 60 deletions(-) create mode 100644 EarlyBlue/communicator/icons/autoscroll-ew.gif create mode 100644 EarlyBlue/communicator/icons/autoscroll-ns.gif create mode 100644 EarlyBlue/communicator/icons/autoscroll.gif create mode 100644 EarlyBlue/global/icons/tab-drag-indicator.gif diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css index 5d9990fe..69af1ed2 100644 --- a/EarlyBlue/communicator/communicator.css +++ b/EarlyBlue/communicator/communicator.css @@ -58,7 +58,7 @@ #offline-status { list-style-image: url("chrome://communicator/skin/icons/online.gif"); } - + /* ::::: directional button icons ::::: */ .up { @@ -85,6 +85,24 @@ } /* ::::: download manager ::::: */ + #downloadView > treechildren::-moz-tree-image(Name) { margin-right: 2px; } + +/* :::::: autoscroll popup ::::: */ + +#autoscroller { + height: 28px; + width: 28px; + border: 0px; + margin: -14px; + padding: 0px; + background-image: url("chrome://communicator/skin/icons/autoscroll.gif"); +} +#autoscroller[scrolldir="NS"] { + background-image: url("chrome://communicator/skin/icons/autoscroll-ns.gif"); +} +#autoscroller[scrolldir="EW"] { + background-image: url("chrome://communicator/skin/icons/autoscroll-ew.gif"); +} diff --git a/EarlyBlue/communicator/icons/autoscroll-ew.gif b/EarlyBlue/communicator/icons/autoscroll-ew.gif new file mode 100644 index 0000000000000000000000000000000000000000..05d252eb73996849dfd4fe604029bf0437cf81a5 GIT binary patch literal 148 zcmZ?wbhEHblwpuzn8*MEEiEno|NjRv6o0a?axpM7=zv5)@(fI=J^d@CAMr2lNxSu0 z>s~ literal 0 HcmV?d00001 diff --git a/EarlyBlue/communicator/icons/autoscroll-ns.gif b/EarlyBlue/communicator/icons/autoscroll-ns.gif new file mode 100644 index 0000000000000000000000000000000000000000..583cc516e23dd6b83f20e16a956da51afa6593af GIT binary patch literal 137 zcmZ?wbhEHblwpuzn8*MEEiEno|NjRv6o0a?axpM7=zv5)@(fH-J^d@CAMr2lNxPI5 ze^!a1A$9iCS_N~jrInKuk8aYRQdDMsKWUwR>HEhQ?VNl!Dm%+2GpM$|6j3eTc1e(Z kO6aWAK literal 0 HcmV?d00001 diff --git a/EarlyBlue/communicator/icons/autoscroll.gif b/EarlyBlue/communicator/icons/autoscroll.gif new file mode 100644 index 0000000000000000000000000000000000000000..7108e6cd2d6730d3a42a18f334374307567bf2d8 GIT binary patch literal 162 zcmZ?wbhEHblwpuzn8*ME4Gj(d|NjRv6o0a?axpM7=zv5)@(fJHJ^d@CAMr2lNxPI5 ze^!a1A$9iCS_N~jrInKuk8aYRQdDMs|IwVu;=C6)qxu3l-AZblW{Y0<(j+Fm`hjv< zsF!vq$F - + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - + + + diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css index 7aac4945..055fd9e1 100644 --- a/EarlyBlue/global/autocomplete.css +++ b/EarlyBlue/global/autocomplete.css @@ -60,7 +60,7 @@ textbox { -moz-box-align: center; -moz-box-pack: center; min-width: 15px; - min-height: 19px; + min-height: 19px; border: 1px outset #CCD0DD; background-color: #9999CC; padding: 1px; @@ -82,7 +82,7 @@ textbox { } .autocomplete-history-popup { - max-height: 180px; + max-height: 25em; } /* ::::: tree ::::: */ diff --git a/EarlyBlue/global/browser.css b/EarlyBlue/global/browser.css index ec2f181c..c34ce0da 100644 --- a/EarlyBlue/global/browser.css +++ b/EarlyBlue/global/browser.css @@ -92,4 +92,19 @@ tabbrowser > tabbox > tabpanels { margin-top: 2px; padding: 0px; list-style-image: url("chrome://global/skin/icons/tab-new.gif"); -} \ No newline at end of file +} + +.tab-drop-indicator-bar { + height: 11px; + margin-top: -11px; + margin-left: -8px; + position: relative; +} + +.tab-drop-indicator { + height: 11px; + width: 11px; + margin-bottom: -8px; + position: relative; + list-style-image: url('chrome://global/skin/icons/tab-drag-indicator.gif'); +} diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 837d4df9..18cc774a 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -62,7 +62,7 @@ menulist > menupopup, } .menulist-compact { - -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact"); + -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact"); } /* @@ -166,3 +166,7 @@ resizer[dir="bottomright"] { .toolbar-focustarget { -moz-user-focus: ignore !important; } + +description.error { + color: #FF0000; +} diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml index 7449d8a9..6036721e 100644 --- a/EarlyBlue/global/globalBindings.xml +++ b/EarlyBlue/global/globalBindings.xml @@ -39,4 +39,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/EarlyBlue/global/icons/tab-drag-indicator.gif b/EarlyBlue/global/icons/tab-drag-indicator.gif new file mode 100644 index 0000000000000000000000000000000000000000..bcd33c7f03ae33431f40101d56dc51fdbca01a4e GIT binary patch literal 76 zcmZ?wbhEHb .menulist-label { +.menulist-compact > .menulist-label-box > .menulist-label { margin: 0 3px !important; text-align: right; } -.menulist-compact > .menulist-dropmarker { +.menulist-compact > .menulist-label-box > .menulist-icon { margin-left: 2px; - border: none; - padding: 0 !important; - background: transparent; -} - -menulist:hover:active > .menulist-dropmarker { - border: none; - padding: 0; } .menulist-compact[open="true"] { @@ -164,3 +157,12 @@ menulist:hover:active > .menulist-dropmarker { color: ThreeDHighlight; */ } +.menulist-compact[disabled="true"] { + list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); +} + +.menulist-compact:focus > .menulist-label-box { + border: 1px dotted; + background-color: transparent; + color: inherit; +} diff --git a/EarlyBlue/global/netError.css b/EarlyBlue/global/netError.css index 4ec2517c..533f04fa 100644 --- a/EarlyBlue/global/netError.css +++ b/EarlyBlue/global/netError.css @@ -64,6 +64,7 @@ body[dir="rtl"] #errorPageContainer { } #errorShortDesc > p { + overflow: auto; border-bottom: 1px solid #666699; padding-bottom: 1em; font-size: 130%; @@ -98,3 +99,7 @@ body[dir="rtl"] #brand { #brand > p { margin: 0; } + +#errorContainer { + display: none; +} diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css index 742c823b..92635b76 100644 --- a/EarlyBlue/global/scrollbars.css +++ b/EarlyBlue/global/scrollbars.css @@ -109,6 +109,7 @@ scrollcorner { -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar-base"); cursor: default; background-color: #999999; + width: 13px; } /* ..... increment .... */ diff --git a/EarlyBlue/global/splitter.css b/EarlyBlue/global/splitter.css index dd534234..702f2522 100644 --- a/EarlyBlue/global/splitter.css +++ b/EarlyBlue/global/splitter.css @@ -46,7 +46,7 @@ splitter { -moz-box-align: center; -moz-box-pack: center; - cursor: e-resize; + cursor: ew-resize; border: none; border-left: 1px solid #9999CC; border-right: 1px solid #9999CC; @@ -62,7 +62,7 @@ splitter:hover:active { /* ::::: splitter (horizontal) ::::: */ splitter[orient="vertical"] { - cursor: n-resize; + cursor: ns-resize; border: none; border-top: 1px solid #9999CC; border-bottom: 1px solid #9999CC; diff --git a/EarlyBlue/messenger/filterDialog.css b/EarlyBlue/messenger/filterDialog.css index 29ec5721..69b386ec 100644 --- a/EarlyBlue/messenger/filterDialog.css +++ b/EarlyBlue/messenger/filterDialog.css @@ -81,5 +81,9 @@ textbox { } .ruleactionitem { + min-width: 20em; +} + +.ruleaction-type { min-width: 15em; } diff --git a/EarlyBlue/messenger/mailWindow1.css b/EarlyBlue/messenger/mailWindow1.css index d212c613..d5642bea 100644 --- a/EarlyBlue/messenger/mailWindow1.css +++ b/EarlyBlue/messenger/mailWindow1.css @@ -13,7 +13,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. @@ -22,7 +22,7 @@ * Robert Kaiser * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only @@ -55,8 +55,22 @@ height: 0px; } +/* XXX bug 313731 buttons are taller than menulists */ + +#msgLocationToolbar > #searchBox[collapsed="true"] { + visibility: hidden; +} + +#locationIcon { + list-style-image: none; +} + +#locationFolders { + width: 20em; +} + /* ..... tree adjustments ..... */ - + #folderTree { border: none; min-width: 1px; @@ -66,3 +80,4 @@ border: none; min-width: 1px; } + diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css index 12851ba5..4aab5ee7 100644 --- a/EarlyBlue/messenger/messengercompose/messengercompose.css +++ b/EarlyBlue/messenger/messengercompose/messengercompose.css @@ -13,7 +13,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. @@ -23,7 +23,7 @@ * Robert Kaiser * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or + * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only @@ -45,14 +45,14 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* ::::: primary toolbar buttons ::::: */ - + #button-send { list-style-image: url("chrome://messenger/skin/messengercompose/send.gif"); } #button-send[disabled="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/send-disabled.gif") !important; -} +} #button-send[offline="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/sendlater.gif"); @@ -68,7 +68,7 @@ #button-address[disabled="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/address-disabled.gif") !important; -} +} #button-attach { list-style-image: url("chrome://messenger/skin/messengercompose/attach.gif"); @@ -76,7 +76,7 @@ #button-attach[disabled="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/attach-disabled.gif") !important; -} +} #button-quote { list-style-image: url("chrome://messenger/skin/messengercompose/quote.gif"); @@ -84,7 +84,7 @@ #button-quote[disabled="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/quote-disabled.gif") !important; -} +} #spellingButton { list-style-image: url("chrome://editor/skin/icons/spell.gif"); @@ -100,7 +100,7 @@ #button-save[disabled="true"] { list-style-image: url("chrome://messenger/skin/messengercompose/savemsg-disabled.gif") !important; -} +} #button-stop { list-style-image: url("chrome://global/skin/icons/stop.gif"); @@ -108,7 +108,7 @@ #button-stop[disabled="true"] { list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important; -} +} /* ::::: autocomplete icons ::::: */ @@ -132,15 +132,6 @@ treechildren::-moz-tree-image(remote-err) { list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif"); } -.identity-popup-item { - -moz-binding: url("chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem"); -} - -.composemenu-text-2 { - font-style: italic; - color: #C0C0C0; -} - /* ::::: EarlyBlue layout corrections ::::: */ #addresses-box, -- 2.35.3