From 4ab920dbb4eda9e3fb843c5ab4af6d41b26d3af3 Mon Sep 17 00:00:00 2001 From: "kerz%netscape.com" Date: Thu, 17 Oct 2002 09:26:34 +0000 Subject: [PATCH] skin cleanup --- browser/base/skin/browser.css | 203 +++++++--------------------- toolkit/skin/unix/jar.mn | 1 - toolkit/skin/unix/toolbarbutton.css | 187 ------------------------- toolkit/skin/win/jar.mn | 2 +- toolkit/skin/win/toolbarbutton.css | 174 +++++++++++------------- 5 files changed, 133 insertions(+), 434 deletions(-) delete mode 100644 toolkit/skin/unix/toolbarbutton.css diff --git a/browser/base/skin/browser.css b/browser/base/skin/browser.css index 6c81dde5559..393beea7823 100644 --- a/browser/base/skin/browser.css +++ b/browser/base/skin/browser.css @@ -52,20 +52,16 @@ toolbarbutton.bookmark-item { min-width: 0; max-width: 13em; padding: 2px 3px; - color: black !important; + border: 0px; + -moz-box-orient: horizontal; + -moz-appearance: none; } toolbarbutton.bookmark-item:not([container="true"]) { - -moz-appearance: none; cursor: default; - border: 1px solid transparent !important; } toolbarbutton.bookmark-item:not([container="true"]):hover { - -moz-border-top-colors: transparent !important; - -moz-border-right-colors: transparent !important; - -moz-border-bottom-colors: transparent !important; - -moz-border-left-colors: transparent !important; text-decoration: underline; cursor: pointer; } @@ -76,8 +72,9 @@ toolbarbutton.bookmark-item[open="true"] { } .bookmark-item > .toolbarbutton-icon { - width: 16px; + width: 18px; height: 16px; + padding-right: 2px; } /* Prevent [mode="icons"] from hiding the label */ @@ -85,6 +82,10 @@ toolbarbutton.bookmark-item[open="true"] { display: -moz-box !important; } +toolbar[mode="text"] .bookmark-item >.toolbarbutton-icon { + display: block; +} + .bookmark-item > .toolbarbutton-menu-dropmarker { display: none; } @@ -104,20 +105,11 @@ toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-customize { display: -moz-box; } -toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-overflow-items { - visibility: hidden; -} - +toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-overflow-items, toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items { visibility: hidden; } -/* ::::: print preview toolbar ::::: */ - -toolbar[printpreview="true"] { - -moz-binding: url("chrome://communicator/content/printPreviewBindings.xml#printpreviewtoolbar"); -} - /* ::::: bookmark menus ::::: */ menu.bookmark-item, @@ -185,121 +177,25 @@ menuitem.bookmark-item { -moz-image-region: rect(0px 16px 16px 0px); } + +/* ::::: print preview toolbar ::::: */ + +toolbar[printpreview="true"] { + -moz-binding: url("chrome://communicator/content/printPreviewBindings.xml#printpreviewtoolbar"); +} + /* ::::: primary toolbar buttons ::::: */ -.toolbarbutton-1 { - -moz-appearance: none !important; - -moz-box-orient: vertical; - min-width: 0px; - padding: 2px 0px !important; - margin: 0px !important; - border: 0px !important; -} - -toolbarbutton:not([disabled="true"]):hover, -menubutton:not([disabled="true"]):hover, -toolbarbutton:not([disabled="true"]):hover:active, -menubutton:not([disabled="true"]):hover:active { - color: black !important; -} - -.toolbarbutton-menubutton-button { - -moz-appearance: none !important; -} - -.toolbarbutton-menubutton-stack, -.toolbarbutton-menubutton-button, -.toolbarbutton-menubutton-stack:hover, -.toolbarbutton-menubutton-button:hover, -.toolbarbutton-menubutton-stack:hover:active, -.toolbarbutton-menubutton-button:hover:active { - border: 0px !important; - padding: 0px !important; - margin: 0px !important; -} - -.toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/dropmarker.png"); - -moz-image-region: rect(0 14px 15px 0px) !important; -} - -toolbarbutton:hover > stack > .toolbarbutton-menubutton-dropmarker { - -moz-image-region: rect(0 29px 15px 15px) !important; -} - -toolbarbutton[disabled="true"] > stack > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[disabled="true"]:hover > stack > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/dropmarker.png") !important; - -moz-image-region: rect(0px 44px 15px 30px) !important; -} - -toolbarbutton[open="true"] > stack > .toolbarbutton-menubutton-dropmarker { - -moz-image-region: rect(0 59px 15px 45px) !important; -} - -#back-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker, -#forward-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker { - margin-left: 38px; - margin-top: 8px; -} - -toolbar[mode="icons"] #back-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker, -toolbar[mode="icons"] #forward-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker { - margin-left: 38px; - margin-top: 22px; -} - -toolbar[iconsize="small"] #back-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker, -toolbar[iconsize="small"] #forward-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker -{ - margin-left: 20px; - margin-top: 0px; -} - -toolbar[iconsize="small"][mode="icons"] #back-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker, -toolbar[iconsize="small"][mode="icons"] #forward-button > .toolbarbutton-menubutton-stack - > .toolbarbutton-menubutton-dropmarker -{ - margin-left: 18px; - margin-top: 12px; -} - -toolbar[mode="icons"] .toolbarbutton-text { - display: none; -} - -toolbar[mode="icons"] .toolbarbutton-icon { - padding: 0px 0px 2px 0px important; -} - -toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker, -toolbar[mode="text"] .toolbarbutton-icon { - display: none; -} - -toolbar[mode="text"] .toolbarbutton-text { - padding: 4px 4px 5px 4px !important; - margin: 5px !important; -} - #back-button { -moz-binding: url('chrome://browser/skin/browser.xml#toolbar-menu-button'); list-style-image: url("chrome://browser/skin/back-large.png"); - -moz-image-region: rect(0px 46px 42px 0px); - -moz-box-orient: vertical; + -moz-image-region: rect(0px 47px 42px 0px); } #back-button[buttonover="true"] { -moz-image-region: rect(0px 100px 42px 54px); } #back-button[disabled="true"] { - -moz-image-region: rect(0px 154px 42px 108px); + -moz-image-region: rect(0px 154px 42px 109px); } #back-button[buttondown="true"] { -moz-image-region: rect(0px 208px 42px 162px); @@ -309,13 +205,12 @@ toolbar[mode="text"] .toolbarbutton-text { -moz-binding: url('chrome://browser/skin/browser.xml#toolbar-menu-button'); list-style-image: url("chrome://browser/skin/forward-large.png"); -moz-image-region: rect(0px 46px 42px 0px); - -moz-box-orient: vertical; } #forward-button[buttonover="true"] { -moz-image-region: rect(0px 100px 42px 54px); } #forward-button[disabled="true"] { - -moz-image-region: rect(0px 154px 42px 108px) !important; + -moz-image-region: rect(0px 154px 42px 109px) !important; } #forward-button[buttondown="true"] { -moz-image-region: rect(0px 208px 42px 162px); @@ -323,45 +218,45 @@ toolbar[mode="text"] .toolbarbutton-text { #reload-button { list-style-image: url("chrome://browser/skin/reload-large.png"); - -moz-image-region: rect(0px 40px 42px 0px); + -moz-image-region: rect(0px 40px 42px 3px); } #reload-button:hover { - -moz-image-region: rect(0px 81px 42px 41px); + -moz-image-region: rect(0px 81px 42px 44px); } #reload-button[disabled="true"] { - -moz-image-region: rect(0px 122px 42px 82px) !important; + -moz-image-region: rect(0px 122px 42px 84px) !important; } #reload-button:hover:active { - -moz-image-region: rect(0px 163px 42px 123px); + -moz-image-region: rect(0px 163px 42px 126px); } #stop-button { list-style-image: url("chrome://browser/skin/stop-large.png"); - -moz-image-region: rect(0px 40px 42px 0px); + -moz-image-region: rect(0px 40px 42px 3px); } #stop-button:hover { - -moz-image-region: rect(0px 81px 42px 41px); + -moz-image-region: rect(0px 81px 42px 44px); } #stop-button[disabled="true"] { - -moz-image-region: rect(0px 122px 42px 82px) !important; + -moz-image-region: rect(0px 121px 42px 84px) !important; } #stop-button:hover:active { - -moz-image-region: rect(0px 163px 42px 123px); + -moz-image-region: rect(0px 163px 42px 126px); } #home-button { list-style-image: url("chrome://browser/skin/home-large.png") !important; - -moz-image-region: rect(0px 40px 42px 0px); + -moz-image-region: rect(0px 40px 42px 1px); } #home-button:hover { - -moz-image-region: rect(0px 94px 42px 54px); + -moz-image-region: rect(0px 94px 42px 55px); } #home-button[disabled="true"] { - -moz-image-region: rect(0px 148px 42px 108px) !important; + -moz-image-region: rect(0px 148px 42px 107px) !important; } #home-button:hover:active { - -moz-image-region: rect(0px 202px 42px 162px); + -moz-image-region: rect(0px 202px 42px 163px); } #print-button { @@ -528,13 +423,13 @@ toolbar[iconsize="small"] #stop-button[disabled="true"] { toolbar[iconsize="small"] #home-button { list-style-image: url("chrome://browser/skin/home-small.png") !important; - -moz-image-region: rect(0px 28px 25px 0px); + -moz-image-region: rect(0px 26px 25px 0px); } toolbar[iconsize="small"] #home-button:hover { - -moz-image-region: rect(0px 56px 25px 28px); + -moz-image-region: rect(0px 54px 25px 28px); } toolbar[iconsize="small"] #home-button:hover:active { - -moz-image-region: rect(0px 112px 25px 84px); + -moz-image-region: rect(0px 110px 25px 84px); } toolbar[iconsize="small"] #print-button { @@ -711,9 +606,9 @@ toolbar[iconsize="small"] #history-button[disabled="true"] { #go-container { -moz-appearance: none !important; background-color: transparent; - margin: 0px; - border: none; - padding: 0px; + margin: 0; + padding: 0; + border: 0; min-width: 0; list-style-image: url("chrome://browser/skin/go-large.png"); -moz-image-region: rect(0px 26px 27px 0px) !important; @@ -723,11 +618,6 @@ toolbar[iconsize="small"] #history-button[disabled="true"] { -moz-image-region: rect(0px 53px 27px 27px) !important; } -#sidebar { - border-bottom: 1px solid ThreeDShadow; - background-color: white; -} - #go-button[disabled="true"] { -moz-image-region: rect(0px 80px 27px 54px) !important; } @@ -753,6 +643,11 @@ toolbar[iconsize="small"] #history-button[disabled="true"] { -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; } +#sidebar { + border-bottom: 1px solid ThreeDShadow; + background-color: white; +} + #status-bar { border-top: none; } @@ -791,9 +686,9 @@ toolbar[iconsize="small"] #history-button[disabled="true"] { #navigator-throbber { -moz-appearance: none; -moz-user-focus: ignore; - margin: 2px 4px !important; - border: none !important; - padding: 0px !important; + margin: 2px 4px; + border: 0; + padding: 0; min-width: 0; background-color: transparent; list-style-image: url("chrome://browser/skin/throbber-stopped.gif"); @@ -815,6 +710,7 @@ toolbar[iconsize="small"] #navigator-throbber[busy="true"] { border: none; list-style-image: url("chrome://browser/skin/close.png"); -moz-image-region: rect(0px 20px 20px 0px); + -moz-appearance: none; } .tabs-closebutton:hover { @@ -827,9 +723,10 @@ toolbar[iconsize="small"] #navigator-throbber[busy="true"] { toolbarbutton.chevron { list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; + display: block !important; } - toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { display: none; -} \ No newline at end of file +} + diff --git a/toolkit/skin/unix/jar.mn b/toolkit/skin/unix/jar.mn index 82bc56ad85c..c90cbe3d489 100644 --- a/toolkit/skin/unix/jar.mn +++ b/toolkit/skin/unix/jar.mn @@ -3,4 +3,3 @@ classic.jar: + skin/classic/global/checkbox.css + skin/classic/global/radio.css + skin/classic/global/button.css -+ skin/classic/global/toolbarbutton.css diff --git a/toolkit/skin/unix/toolbarbutton.css b/toolkit/skin/unix/toolbarbutton.css deleted file mode 100644 index d5cfa3b86da..00000000000 --- a/toolkit/skin/unix/toolbarbutton.css +++ /dev/null @@ -1,187 +0,0 @@ -/* - * 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. - * - * Contributor(s): - * Joe Hewitt (hewitt@netscape.com) - * Brian Ryner - */ - -/* ===== toolbarbutton.css ===================================================== - == Styles used by the XUL button element. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: toolbarbutton ::::: */ - -toolbarbutton { - -moz-appearance: toolbarbutton; - -moz-box-align: center; - -moz-box-pack: center; - margin: 0; - border: 2px solid; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; - padding: 2px; - background-color: transparent; - color: -moz-DialogText; -} - -.toolbarbutton-icon { - margin-right: 2px; -} - -.toolbarbutton-text { - margin: 0 !important; - text-align: center; -} - -toolbarbutton:hover, -toolbarbutton[buttonover="true"] { - -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight; -} - -toolbarbutton:hover:active, -toolbarbutton[open="true"] { - -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow; - padding: 3px 1px 1px 3px; -} - -toolbarbutton[disabled="true"], -toolbarbutton[disabled="true"]:hover, -toolbarbutton[disabled="true"]:hover:active -toolbarbutton[disabled="true"][open="true"] { - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; - padding: 2px; - color: GrayText; -} - -/* ..... checked state ..... */ - -toolbarbutton[checked="true"] { - -moz-border-top-colors: ThreeDLightShadow ThreeDShadow !important; - -moz-border-right-colors: ThreeDLightShadow ThreeDHighlight !important; - -moz-border-bottom-colors: ThreeDLightShadow ThreeDHighlight !important; - -moz-border-left-colors: ThreeDLightShadow ThreeDShadow !important; - padding: 2px !important; - background-color: ThreeDHighlight !important; - color: ButtonText !important; -} - -/* ::::: toolbarbutton menu ::::: */ - -.toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); -} - -.toolbarbutton-menu-dropmarker[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); -} - -/* ::::: toolbarbutton menu-button ::::: */ - -toolbarbutton[type="menu-button"] { - -moz-box-align: stretch; - -moz-appearance: dualbutton; -} - -toolbarbutton[type="menu-button"], -toolbarbutton[type="menu-button"]:hover, -toolbarbutton[type="menu-button"]:hover:active, -toolbarbutton[type="menu-button"][open="true"], -toolbarbutton[type="menu-button"][disabled="true"], -toolbarbutton[type="menu-button"][disabled="true"]:hover, -toolbarbutton[type="menu-button"][disabled="true"]:hover:active { - border: 1px solid; - padding: 0; -} - -.toolbarbutton-menubutton-button { - -moz-box-align: center; - -moz-box-pack: center; -} - -.toolbarbutton-menubutton-button, -.toolbarbutton-menubutton-dropmarker { - border: 1px solid; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; -} - -.toolbarbutton-menubutton-button[disabled="true"], -.toolbarbutton-menubutton-dropmarker[disabled="true"] { - -moz-border-top-colors: transparent !important; - -moz-border-right-colors: transparent !important; - -moz-border-bottom-colors: transparent !important; - -moz-border-left-colors: transparent !important; -} - -toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button { - -moz-border-top-colors: ThreeDHighlight; - -moz-border-right-colors: ThreeDShadow; - -moz-border-bottom-colors: ThreeDShadow; - -moz-border-left-colors: ThreeDHighlight; -} - -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - -moz-border-top-colors: ThreeDShadow; - -moz-border-right-colors: ThreeDHighlight; - -moz-border-bottom-colors: ThreeDHighlight; - -moz-border-left-colors: ThreeDShadow; -} - -/* .......... dropmarker .......... */ - -.toolbarbutton-menubutton-dropmarker { - -moz-box-align: center; - padding: 0 0 1px 0; - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); - -moz-appearance: dualbutton-dropdown; -} - -.toolbarbutton-menubutton-dropmarker[disabled="true"] { - border: 1px solid transparent !important; - padding: 0 0 1px 0 !important; - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") !important; -} - -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker { - padding: 1px 0 0 0; -} diff --git a/toolkit/skin/win/jar.mn b/toolkit/skin/win/jar.mn index 4b36009f893..955a180b3ca 100644 --- a/toolkit/skin/win/jar.mn +++ b/toolkit/skin/win/jar.mn @@ -23,7 +23,7 @@ classic.jar: + skin/classic/global/splitter.css + skin/classic/global/tabbox.css + skin/classic/global/textbox.css -+ skin/classic/global/toolbarbutton.css +*+ skin/classic/global/toolbarbutton.css + skin/classic/global/tree.css + skin/classic/global/wizard.css + skin/classic/global/wizardOverlay.css diff --git a/toolkit/skin/win/toolbarbutton.css b/toolkit/skin/win/toolbarbutton.css index 007d9b98e8f..433c4ad9d5d 100644 --- a/toolkit/skin/win/toolbarbutton.css +++ b/toolkit/skin/win/toolbarbutton.css @@ -34,18 +34,17 @@ toolbarbutton { -moz-box-align: center; -moz-box-pack: center; margin: 0; - border: 2px solid; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; - padding: 2px; - background-color: transparent; - color: -moz-DialogText; + border: 2px solid transparent; + padding: 1px; + color: MenuText; } -.toolbarbutton-icon { - margin-right: 2px; +.toolbarbutton-1 { + -moz-appearance: none; +} + +toolbar[mode="text"] .toolbarbutton-1 { + -moz-appearance: toolbarbutton; } .toolbarbutton-text { @@ -53,34 +52,48 @@ toolbarbutton { text-align: center; } -toolbarbutton:hover, -toolbarbutton[buttonover="true"] { +toolbar[mode="icons"] .toolbarbutton-text, +toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker, +toolbar[mode="text"] .toolbarbutton-icon { + display: none; +} + +toolbar[mode="text"] .toolbarbutton-text { + padding: 2px; +} + +toolbar[mode="text"] toolbarbutton:hover, +toolbar[mode="text"] toolbarbutton[buttonover="true"] { -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight; -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight; - color: #0000FF; -} - -toolbarbutton:hover:active, -toolbarbutton[open="true"] { +} + +toolbar[mode="text"] toolbarbutton:hover:active, +toolbar[mode="text"] toolbarbutton[open="true"] { -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow; -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight; -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight; -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow; - padding: 3px 1px 1px 3px; - color: #0000FF; + padding: 2px 0px 0px 2px; +} + +toolbar[mode="text"] toolbarbutton[disabled="true"], +toolbar[mode="text"] toolbarbutton[disabled="true"]:hover, +toolbar[mode="text"] toolbarbutton[disabled="true"]:hover:active +toolbar[mode="text"] toolbarbutton[disabled="true"][open="true"] { + -moz-border-top-colors: transparent; + -moz-border-right-colors: transparent; + -moz-border-bottom-colors: transparent; + -moz-border-left-colors: transparent; + padding: 1px; } toolbarbutton[disabled="true"], toolbarbutton[disabled="true"]:hover, toolbarbutton[disabled="true"]:hover:active toolbarbutton[disabled="true"][open="true"] { - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; - padding: 2px; color: GrayText; } @@ -91,79 +104,42 @@ toolbarbutton[checked="true"] { -moz-border-right-colors: ThreeDLightShadow ThreeDHighlight !important; -moz-border-bottom-colors: ThreeDLightShadow ThreeDHighlight !important; -moz-border-left-colors: ThreeDLightShadow ThreeDShadow !important; - padding: 2px !important; background-color: ThreeDHighlight !important; color: ButtonText !important; } - + +toolbar[mode="text"] toolbarbutton[checked="true"] { + padding: 2px 0px 0px 2px; +} + /* ::::: toolbarbutton menu ::::: */ -.toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); -} - -.toolbarbutton-menu-dropmarker[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); -} - -/* ::::: toolbarbutton menu-button ::::: */ - -toolbarbutton[type="menu-button"] { - -moz-box-align: stretch; -} - -toolbarbutton[type="menu-button"], -toolbarbutton[type="menu-button"]:hover, -toolbarbutton[type="menu-button"]:hover:active, -toolbarbutton[type="menu-button"][open="true"], -toolbarbutton[type="menu-button"][disabled="true"], -toolbarbutton[type="menu-button"][disabled="true"]:hover, -toolbarbutton[type="menu-button"][disabled="true"]:hover:active { - border: 1px solid; - padding: 0; -} - .toolbarbutton-menubutton-button { - -moz-box-align: center; - -moz-box-pack: center; + margin: -4px -2px; + -moz-appearance: none; } -.toolbarbutton-menubutton-button, -.toolbarbutton-menubutton-dropmarker { - border: 1px solid; - -moz-border-top-colors: transparent; - -moz-border-right-colors: transparent; - -moz-border-bottom-colors: transparent; - -moz-border-left-colors: transparent; +toolbar[mode="text"] .toolbarbutton-menubutton-button { + margin: -3px -2px; } -.toolbarbutton-menubutton-button[disabled="true"], -.toolbarbutton-menubutton-dropmarker[disabled="true"] { - -moz-border-top-colors: transparent !important; - -moz-border-right-colors: transparent !important; - -moz-border-bottom-colors: transparent !important; - -moz-border-left-colors: transparent !important; +.toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/dropmarker.png"); + -moz-image-region: rect(0 14px 15px 0px) !important; } -toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button { - -moz-border-top-colors: ThreeDHighlight; - -moz-border-right-colors: ThreeDShadow; - -moz-border-bottom-colors: ThreeDShadow; - -moz-border-left-colors: ThreeDHighlight; +toolbarbutton:hover > stack > .toolbarbutton-menubutton-dropmarker { + -moz-image-region: rect(0 29px 15px 15px) !important; } -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button, -toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - -moz-border-top-colors: ThreeDShadow; - -moz-border-right-colors: ThreeDHighlight; - -moz-border-bottom-colors: ThreeDHighlight; - -moz-border-left-colors: ThreeDShadow; +toolbarbutton[disabled="true"] > stack > .toolbarbutton-menubutton-dropmarker, +toolbarbutton[disabled="true"]:hover > stack > .toolbarbutton-menubutton-dropmarker { + list-style-image: url("chrome://browser/skin/dropmarker.png") !important; + -moz-image-region: rect(0px 44px 15px 30px) !important; +} + +toolbarbutton[open="true"] > stack > .toolbarbutton-menubutton-dropmarker { + -moz-image-region: rect(0 59px 15px 45px) !important; } /* .......... dropmarker .......... */ @@ -171,16 +147,30 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm .toolbarbutton-menubutton-dropmarker { -moz-box-align: center; padding: 0 0 1px 0; - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + list-style-image: url("chrome://browser/skin/dropmarker.png"); + -moz-image-region: rect(0 14px 15px 0px) !important; + margin-left: 38px; + margin-top: 8px; +#ifdef XP_UNIX + -moz-appearance: dualbutton-dropdown; +#endif +} + +toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker { + margin-left: 38px; + margin-top: 22px; +} + +toolbar[mode="full"][iconsize="small"] .toolbarbutton-menubutton-dropmarker { + margin-left: 22px; + margin-top: 0px; +} + +toolbar[mode="icons"][iconsize="small"] .toolbarbutton-menubutton-dropmarker{ + margin-left: 20px; + margin-top: 12px; } .toolbarbutton-menubutton-dropmarker[disabled="true"] { - border: 1px solid transparent !important; - padding: 0 0 1px 0 !important; - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") !important; -} - -toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker, -toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker { - padding: 1px 0 0 0; + -moz-image-region: rect(0px 44px 15px 30px) !important; }