From: robert Date: Fri, 12 Jan 2007 18:48:09 +0000 (+0000) Subject: keep up with trunk development X-Git-Tag: EarlyBlue-2.0a1~28 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=1697de532db9a940eb792d439c3176290d7ed5ad keep up with trunk development --- diff --git a/EarlyBlue/communicator/alerts/alert.css b/EarlyBlue/communicator/alerts/alert.css index cb7b3394..a9382b22 100644 --- a/EarlyBlue/communicator/alerts/alert.css +++ b/EarlyBlue/communicator/alerts/alert.css @@ -53,18 +53,24 @@ min-height: 50px; } -.alertImageBox { - margin-left: 4px; - margin-right: 6px; +.alertBox[orient="horizontal"] > .alertImageBox { + -moz-margin-start: 4px; + -moz-margin-end: 6px; min-height: 46px; } +.alertBox[orient="vertical"] > .alertImageBox { + margin-top: 6px; + margin-bottom: 4px; + min-width: 46px; +} + .alertTitle { font-weight: bold; } .alertText { - margin-right: 6px; + -moz-margin-end: 6px; } .alertText[clickable="true"] { @@ -77,7 +83,14 @@ color: #424F63; } -.alertTextBox { - padding-right: 10px; +.alertBox[orient="horizontal"] > .alertTextBox { + -moz-padding-start: 10px; padding-top: 5px; } + +.alertBox[orient="vertical"] > .alertTextBox { + -moz-padding-start: 5px; + -moz-padding-end: 5px; + margin-bottom: 8px; + -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */ +} diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css index e08ac8b6..4d94de3f 100644 --- a/EarlyBlue/communicator/communicator.css +++ b/EarlyBlue/communicator/communicator.css @@ -103,11 +103,39 @@ border: 0px; margin: -14px; padding: 0px; - background-image: url("chrome://communicator/skin/icons/autoscroll.gif"); + background-image: url("chrome://communicator/skin/icons/autoscroll.png"); + background-color: transparent; + -moz-appearance: none; } + #autoscroller[scrolldir="NS"] { - background-image: url("chrome://communicator/skin/icons/autoscroll-ns.gif"); + background-position: left center; } + #autoscroller[scrolldir="EW"] { - background-image: url("chrome://communicator/skin/icons/autoscroll-ew.gif"); + background-position: left bottom; +} + +#autoscroller[transparent="true"] { + background-position: center top; +} + +#autoscroller[transparent="true"][scrolldir="NS"] { + background-position: center center; +} + +#autoscroller[transparent="true"][scrolldir="EW"] { + background-position: center bottom; +} + +#autoscroller[translucent="true"] { + background-position: right top; +} + +#autoscroller[translucent="true"][scrolldir="NS"] { + background-position: right center; +} + +#autoscroller[translucent="true"][scrolldir="EW"] { + background-position: right bottom; } diff --git a/EarlyBlue/communicator/icons/autoscroll-ew.gif b/EarlyBlue/communicator/icons/autoscroll-ew.gif deleted file mode 100644 index 05d252eb..00000000 Binary files a/EarlyBlue/communicator/icons/autoscroll-ew.gif and /dev/null differ diff --git a/EarlyBlue/communicator/icons/autoscroll-ns.gif b/EarlyBlue/communicator/icons/autoscroll-ns.gif deleted file mode 100644 index 583cc516..00000000 Binary files a/EarlyBlue/communicator/icons/autoscroll-ns.gif and /dev/null differ diff --git a/EarlyBlue/communicator/icons/autoscroll.gif b/EarlyBlue/communicator/icons/autoscroll.gif deleted file mode 100644 index 7108e6cd..00000000 Binary files a/EarlyBlue/communicator/icons/autoscroll.gif and /dev/null differ diff --git a/EarlyBlue/communicator/icons/autoscroll.png b/EarlyBlue/communicator/icons/autoscroll.png new file mode 100644 index 00000000..f3b40475 Binary files /dev/null and b/EarlyBlue/communicator/icons/autoscroll.png differ diff --git a/EarlyBlue/communicator/smileys.css b/EarlyBlue/communicator/smileys.css index 3db9ecf9..40d55654 100644 --- a/EarlyBlue/communicator/smileys.css +++ b/EarlyBlue/communicator/smileys.css @@ -124,7 +124,7 @@ span.moz-smiley-s7 { background-image: url("chrome://communicator/skin/icons/smileys/undecided_n.gif"); } -/* suprise */ +/* surprise */ span.moz-smiley-s8 { background-image: url("chrome://communicator/skin/icons/smileys/surprise_n.gif"); } diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css index 3f1fede5..6476aeab 100644 --- a/EarlyBlue/global/menu.css +++ b/EarlyBlue/global/menu.css @@ -183,28 +183,28 @@ menuitem[checked="true"] { list-style-image: url("chrome://global/skin/menu/menu-check.gif"); } -menuitem[checked="true"][disabled="true"] { - list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif"); -} - menuitem[checked="true"][_moz-menuactive="true"] { list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif"); } +menuitem[checked="true"][disabled="true"] { + list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif"); +} + /* ::::: radio menuitem ::::: */ menuitem[checked="true"][type="radio"] { list-style-image: url("chrome://global/skin/menu/menu-radio.gif"); } -menuitem[checked="true"][type="radio"][disabled="true"] { - list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif"); -} - menuitem[checked="true"][type="radio"][_moz-menuactive="true"] { list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif"); } +menuitem[checked="true"][type="radio"][disabled="true"] { + list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif"); +} + /* ::::: menuseparator ::::: */ menuseparator { diff --git a/EarlyBlue/global/numberbox.css b/EarlyBlue/global/numberbox.css index e1515ce3..353ffb4b 100644 --- a/EarlyBlue/global/numberbox.css +++ b/EarlyBlue/global/numberbox.css @@ -11,6 +11,8 @@ * for the specific language governing rights and limitations under the * License. * + * The Original Code is mozilla.org code. + * * The Initial Developer of the Original Code is the Mozilla Corporation * Portions created by the Initial Developer are Copyright (C) 2006 * the Initial Developer. All Rights Reserved. diff --git a/EarlyBlue/global/printing.css b/EarlyBlue/global/printing.css index 41ff3508..f1128cd4 100644 --- a/EarlyBlue/global/printing.css +++ b/EarlyBlue/global/printing.css @@ -56,16 +56,6 @@ list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp.gif"); } -/* ...... scale in/decrement ..... */ - -.up-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); -} - -.down-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-down-sharp.gif"); -} - /* ..... orientation ..... */ .toolbar-portrait-page { diff --git a/EarlyBlue/global/spinbuttons.css b/EarlyBlue/global/spinbuttons.css index b672db9d..12ed97a0 100644 --- a/EarlyBlue/global/spinbuttons.css +++ b/EarlyBlue/global/spinbuttons.css @@ -74,7 +74,7 @@ spinbuttons { background-repeat: no-repeat; } -.spinbuttons-up:hover:active { +.spinbuttons-up[disabled="true"] { background-image: url("chrome://global/skin/arrow/arrow-up-disabled.gif"); } diff --git a/EarlyBlue/global/textbox.css b/EarlyBlue/global/textbox.css index 13cb2f79..f194f305 100644 --- a/EarlyBlue/global/textbox.css +++ b/EarlyBlue/global/textbox.css @@ -83,7 +83,7 @@ textbox[disabled="true"] { cursor: default; background-color: #FFFFFF; color: #CCCCCC; -} +} textbox[focused="true"] { -moz-border-top-colors: #6699CC #6699CC; diff --git a/EarlyBlue/messenger/accountManage.css b/EarlyBlue/messenger/accountManage.css index 5e7e1b10..5a3d52a5 100644 --- a/EarlyBlue/messenger/accountManage.css +++ b/EarlyBlue/messenger/accountManage.css @@ -49,6 +49,10 @@ margin-left: 20px; } +.fccReplyFollowsParent { + margin-left: 20px; +} + .selectForOfflineUseButton { list-style-image: url("chrome://communicator/skin/icons/offline.gif"); } diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css index 69cc7848..13b6ff38 100644 --- a/EarlyBlue/messenger/primaryToolbar.css +++ b/EarlyBlue/messenger/primaryToolbar.css @@ -164,3 +164,7 @@ list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png"); padding: 3px; } + +#allowRemoteContentForAuthorDesc { + padding-left: 10px; +} diff --git a/EarlyBlue/messenger/virtualFolderListDialog.css b/EarlyBlue/messenger/virtualFolderListDialog.css index 1eacf145..f97b2390 100644 --- a/EarlyBlue/messenger/virtualFolderListDialog.css +++ b/EarlyBlue/messenger/virtualFolderListDialog.css @@ -3,6 +3,7 @@ ======================================================================= */ @import url("chrome://messenger/skin/mailWindow1.css"); +@import url("chrome://messenger/skin/folderPane.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");