Bug 348614, better theming for dropmarker, r=neil,mano

CVS: ----------------------------------------------------------------------
This commit is contained in:
enndeakin%sympatico.ca 2006-08-28 15:56:47 +00:00
Родитель 70915a821f
Коммит bd564f9554
45 изменённых файлов: 220 добавлений и 1017 удалений

Просмотреть файл

@ -57,16 +57,7 @@ textbox {
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-appearance: none !important;
}
.autocomplete-history-dropmarker[open="true"] {

Просмотреть файл

@ -125,17 +125,14 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
-moz-appearance: none !important;
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
background-color: transparent !important;
border: none !important;
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin: 2px 0px 0px 2px;
}

Просмотреть файл

@ -0,0 +1,32 @@
dropmarker {
-moz-appearance: menulist-button;
width: 16px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto;
}
dropmarker:hover:active {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;
-moz-border-bottom-colors: ThreeDShadow ThreeDFace;
-moz-border-left-colors: ThreeDShadow ThreeDFace;
padding: 2px 0 0 2px;
}
dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight !important;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
padding: 1px !important;
}

Просмотреть файл

@ -115,12 +115,9 @@ toolbarbutton[checked="true"] {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
/* ::::: toolbarbutton menu-button ::::: */
@ -148,7 +145,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
.toolbarbutton-menubutton-button,
.toolbarbutton-menubutton-dropmarker {
border: 1px solid;
border: 1px solid !important;
-moz-border-top-colors: transparent;
-moz-border-right-colors: transparent;
-moz-border-bottom-colors: transparent;
@ -186,16 +183,14 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
-moz-appearance: none !important;
background-color: transparent !important;
padding: 0 0 1px 0;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.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,

Просмотреть файл

@ -73,21 +73,6 @@ textbox {
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
-moz-appearance: menulist-button;
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.autocomplete-history-dropmarker[open="true"] {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;

Просмотреть файл

@ -136,17 +136,14 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-appearance: none !important;
margin: 1px;
background-color: transparent !important;
border: none !important;
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin: 2px 0px 0px 2px;
}

Просмотреть файл

@ -115,12 +115,9 @@ toolbarbutton[checked="true"] {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
/* ::::: toolbarbutton menu-button ::::: */
@ -148,7 +145,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
.toolbarbutton-menubutton-button,
.toolbarbutton-menubutton-dropmarker {
border: 1px solid;
border: 1px solid !important;
-moz-border-top-colors: transparent;
-moz-border-right-colors: transparent;
-moz-border-bottom-colors: transparent;
@ -184,17 +181,14 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
/* .......... 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-image-region: auto; /* cut off inheritance */
-moz-appearance: dualbutton-dropdown;
background-color: transparent !important;
padding: 0 0 1px 0;
-moz-appearance: dualbutton-dropdown !important;
}
.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,

Просмотреть файл

@ -56,21 +56,6 @@ textbox {
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
-moz-appearance: menulist-button;
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.autocomplete-history-dropmarker[open="true"] {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;

Просмотреть файл

@ -132,17 +132,14 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
-moz-appearance: none !important;
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
background-color: transparent !important;
border: none !important;
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin: 2px 0px 0px 2px;
}

Просмотреть файл

@ -0,0 +1,32 @@
dropmarker {
-moz-appearance: menulist-button;
width: 16px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto;
}
dropmarker:hover:active {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;
-moz-border-bottom-colors: ThreeDShadow ThreeDFace;
-moz-border-left-colors: ThreeDShadow ThreeDFace;
padding: 2px 0 0 2px;
}
dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight !important;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
padding: 1px !important;
}

Просмотреть файл

@ -82,17 +82,6 @@ menulist[open="true"]:focus > .menulist-label-box {
/* ..... dropmarker ..... */
.menulist-dropmarker {
-moz-appearance: menulist-button;
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
background-color: -moz-Dialog;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.menulist-dropmarker,
menulist[disabled="true"]:hover:active > .menulist-dropmarker {
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
@ -101,10 +90,6 @@ menulist[disabled="true"]:hover:active > .menulist-dropmarker {
padding: 1px;
}
menulist[disabled="true"] > .menulist-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
menulist:hover:active > .menulist-dropmarker {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;

Просмотреть файл

@ -114,12 +114,9 @@ toolbarbutton[checked="true"] {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
/* ::::: toolbarbutton menu-button ::::: */
@ -146,7 +143,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
.toolbarbutton-menubutton-button,
.toolbarbutton-menubutton-dropmarker {
border: 1px solid;
border: 1px solid !important;
-moz-border-top-colors: transparent;
-moz-border-right-colors: transparent;
-moz-border-bottom-colors: transparent;
@ -182,16 +179,14 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
-moz-appearance: none !important;
background-color: transparent !important;
padding: 0 0 1px 0;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.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,

Просмотреть файл

@ -147,6 +147,7 @@ classic.jar:
skin/classic/global/colorpicker.css (global/mac/colorpicker.css)
skin/classic/global/autocomplete.css (global/mac/autocomplete.css)
skin/classic/global/dialog.css (global/mac/dialog.css)
skin/classic/global/dropmarker.css (global/mac/dropmarker.css)
skin/classic/global/filepicker.css (global/mac/filepicker.css)
skin/classic/global/formatting.css (global/mac/formatting.css)
skin/classic/global/global.css (global/mac/global.css)
@ -264,6 +265,7 @@ classic.jar:
skin/classic/global/colorpicker.css (global/win/colorpicker.css)
skin/classic/global/console.css (global/win/console.css)
skin/classic/global/dialog.css (global/win/dialog.css)
skin/classic/global/dropmarker.css (global/win/dropmarker.css)
skin/classic/global/filepicker.css (global/win/filepicker.css)
skin/classic/global/formatting.css (global/win/formatting.css)
skin/classic/global/groupbox.css (global/win/groupbox.css)

Просмотреть файл

@ -56,8 +56,9 @@ textbox[type="autocomplete"] {
.autocomplete-history-dropmarker {
margin: 2px;
-moz-box-align: center;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
padding: 0;
border: none !important;
background-color: transparent !important;
}
.autocomplete-history-dropmarker[open="true"] {

Просмотреть файл

@ -1,182 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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.org code.
*
* 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.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* ===== button.css =====================================================
== Styles used by the XUL button element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* :::::::::: button :::::::::: */
button {
margin: 2px;
border: 6px solid;
-moz-border-top-colors: transparent transparent transparent #000000 #BBC6D1 #B1BBC9;
-moz-border-right-colors: transparent transparent transparent #000000 #A2AEBB #A7B4C1;
-moz-border-bottom-colors: transparent transparent transparent #000000 #97A6B6 #9DAAB9;
-moz-border-left-colors: transparent transparent transparent #000000 #BBC6D1 #B1BBC9;
-moz-border-radius: 5px;
min-width: 6em;
background-color: #AAB6C4;
color: #000000;
font: menu;
}
.button-icon {
margin-left: 2px;
}
.button-text {
margin: 0px 6px 0px 4px !important;
text-align: center;
}
/* .......... focused state .......... */
button:focus {
-moz-border-top-colors: transparent #98A5B2 #98A5B2 #000000 #BBC6D1 #B1BBC9;
-moz-border-right-colors: transparent #98A5B2 #98A5B2 #000000 #A2AEBB #A7B4C1;
-moz-border-bottom-colors: transparent #98A5B2 #98A5B2 #000000 #97A6B6 #9DAAB9;
-moz-border-left-colors: transparent #98A5B2 #98A5B2 #000000 #BBC6D1 #B1BBC9;
}
/* .......... active/open/checked state .......... */
button:hover:active,
button[checked="true"],
button[open="true"] {
-moz-border-top-colors: transparent transparent transparent #000000 #8290A5 #899AAC;
-moz-border-right-colors: transparent transparent transparent #000000 #8290A5 #899AAC;
-moz-border-bottom-colors: transparent transparent transparent #000000 #8290A5 #899AAC;
-moz-border-left-colors: transparent transparent transparent #000000 #8290A5 #899AAC;
background-color: #90A1B3;
color: #FFFFFF;
}
button:hover:active:focus,
button[checked="true"]:focus,
button[open="true"]:focus {
-moz-border-top-colors: transparent #98A5B2 #98A5B2 #000000 #8290A5 #899AAC;
-moz-border-right-colors: transparent #98A5B2 #98A5B2 #000000 #8290A5 #899AAC;
-moz-border-bottom-colors: transparent #98A5B2 #98A5B2 #000000 #8290A5 #899AAC;
-moz-border-left-colors: transparent #98A5B2 #98A5B2 #000000 #8290A5 #899AAC;
}
/* .......... disabled state .......... */
button[disabled="true"] {
-moz-border-top-colors: transparent transparent transparent #8290A5 #C6CDD7 #BCC5D1 !important;
-moz-border-right-colors: transparent transparent transparent #8290A5 #A9B5C1 #B2BAC7 !important;
-moz-border-bottom-colors: transparent transparent transparent #8290A5 #A9B5C1 #B2BAC7 !important;
-moz-border-left-colors: transparent transparent transparent #8290A5 #C6CDD7 #BCC5D1 !important;
background-color: #B7BFCB !important;
color: #8C99AB !important;
}
/* .......... default state .......... */
button[default="true"] {
-moz-border-top-colors: transparent transparent #000000 #000000 #BBC6D1 #B1BBC9;
-moz-border-right-colors: transparent transparent #000000 #000000 #A2AEBB #A7B4C1;
-moz-border-bottom-colors: transparent transparent #000000 #000000 #97A6B6 #9DAAB9;
-moz-border-left-colors: transparent transparent #000000 #000000 #BBC6D1 #B1BBC9;
}
button[default="true"]:hover:active {
-moz-border-top-colors: transparent transparent #000000 #000000 #8290A5 #899AAC;
-moz-border-right-colors: transparent transparent #000000 #000000 #8290A5 #899AAC;
-moz-border-bottom-colors: transparent transparent #000000 #000000 #8290A5 #899AAC;
-moz-border-left-colors: transparent transparent #000000 #000000 #8290A5 #899AAC;
-moz-border-radius: 4px;
}
button[default="true"]:hover:active:focus {
-moz-border-top-colors: #98A5B2 #98A5B2 #000000 #000000 #8290A5 #899AAC;
-moz-border-right-colors: #98A5B2 #98A5B2 #000000 #000000 #8290A5 #899AAC;
-moz-border-bottom-colors: #98A5B2 #98A5B2 #000000 #000000 #8290A5 #899AAC;
-moz-border-left-colors: #98A5B2 #98A5B2 #000000 #000000 #8290A5 #899AAC;
}
button[default="true"]:focus {
-moz-border-top-colors: #98A5B2 #98A5B2 #000000 #000000 #BBC6D1 #B1BBC9;
-moz-border-right-colors: #98A5B2 #98A5B2 #000000 #000000 #A2AEBB #A7B4C1;
-moz-border-bottom-colors: #98A5B2 #98A5B2 #000000 #000000 #97A6B6 #9DAAB9;
-moz-border-left-colors: #98A5B2 #98A5B2 #000000 #000000 #BBC6D1 #B1BBC9;
}
/* ::::: menu/menu-button buttons ::::: */
button[type="menu-button"] {
-moz-box-align: center;
-moz-box-pack: center;
border: none !important;
background: transparent !important;
}
.button-menubutton-button {
margin: 0;
}
.button-menu-dropmarker,
.button-menubutton-dropmarker {
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
min-width:9px;
min-height:5px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin: 2px 0px 0px 2px;
}
/* ::::: plain buttons ::::: */
button.plain,
button.plain:hover,
button.plain:hover:active
{
margin: 0px;
border: none !important;
padding: 0px;
}

Просмотреть файл

Просмотреть файл

@ -1,220 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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.org code.
*
* 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.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* ===== menulist.css ===================================================
== Styles used by the XUL menulist element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
/* :::::::::: menulist :::::::::: */
menulist {
margin: 1px 4px;
border: 2px solid transparent;
min-height: 19px;
color: #000000;
font: message-box;
}
.menulist-label {
margin: 0 2px 0 0 !important;
}
.menulist-description {
font-style: italic;
color: #5D616E;
margin-left: 1em !important;
}
.menulist-icon {
padding-right: 2px;
}
.menulist-label-box {
-moz-box-align: center;
-moz-box-pack: center;
border-top: 3px solid;
border-bottom: 3px solid;
border-left: 3px solid;
-moz-border-top-colors: #000000 #BBC4D1 #B3BBC9;
-moz-border-bottom-colors: #000000 #99A7B7 #9EACBB;
-moz-border-left-colors: #000000 #BBC4D1 #B3BBC9;
-moz-border-radius-topleft: 2px;
-moz-border-radius-bottomleft: 2px;
background-color: #A6B3C0;
padding-left: 8px;
}
.menulist-dropmarker {
-moz-box-align: center;
-moz-box-pack: center;
border-top: 3px solid;
border-right: 3px solid;
border-bottom: 3px solid;
border-left: 2px solid;
-moz-border-top-colors: #000000 #BBC4D1 #B3BBC9;
-moz-border-bottom-colors: #000000 #99A7B7 #9EACBB;
-moz-border-right-colors: #000000 #99A7B7 #9EACBB;
-moz-border-left-colors: #6D7C8F #C1CBD9;
-moz-border-radius-topright: 2px;
-moz-border-radius-bottomright: 2px;
background-color: #A6B3C0;
list-style-image: url("chrome://global/skin/menulist/mlist-arrow.gif");
}
.dropmarker-icon {
margin: 1px 2px 0px 2px;
}
/* ..... focused state ..... */
menulist:focus {
border-color: #98A5B2;
-moz-border-radius: 7px;
background-color: #98A5B2;
}
/* ..... active state ..... */
menulist[open="true"] {
color: #FFFFFF;
}
menulist[open="true"] > .menulist-label-box {
-moz-border-top-colors: #313948 #8393A7 #8C9DAF;
-moz-border-bottom-colors: #313948 #8393A7 #8C9DAF;
-moz-border-left-colors: #313948 #8393A7 #8C9DAF;
background-color: #91A2B4;
}
menulist[open="true"] > .menulist-dropmarker {
list-style-image: url("chrome://global/skin/menulist/mlist-act-arrow.gif");
}
/* ..... disabled state ..... */
menulist[disabled="true"] {
color: #8C99AB !important;
}
menulist[disabled="true"] > .menulist-label-box,
menulist[disabled="true"] > .menulist-dropmarker {
-moz-border-top-colors: #727D8E #D0D6DF #BDC6D2 !important;
-moz-border-bottom-colors: #727D8E #AAB5C2 #B3BBC8 !important;
background-color: #B7BFCB !important;
}
menulist[disabled="true"] > .menulist-label-box {
-moz-border-left-colors: #727D8E #C9D0D9 #BDC6D2 !important;
}
menulist[disabled="true"] > .menulist-dropmarker {
-moz-border-right-colors: #727D8E #AAB5C2 #B3BBC8 !important;
-moz-border-left-colors: #95A1AD #C7D0DC !important;
list-style-image: url("chrome://global/skin/menulist/mlist-dis-arrow.gif") !important;
}
/* ::::: editable menulists ::::: */
.menulist-editable-box {
border: 1px solid #000000;
border-right: none;
background-color: #FFFFFF;
padding: 2px 0px 2px 2px;
}
html|*.menulist-editable-input {
margin: 0px !important;
border: none !important;
padding: 0px !important;
background: inherit;
font: inherit;
}
menulist[focused="true"] {
border-color: #98A5B2;
-moz-border-radius-topright: 7px;
-moz-border-radius-bottomright: 7px;
background-color: #98A5B2;
}
/* ::::: compact menulists ::::: */
.menulist-compact {
-moz-box-align: center;
-moz-box-pack: center;
margin: 0;
border: 2px solid;
-moz-border-top-colors: #CED5DD #A6B3C0;
-moz-border-right-colors: #5D616E #99A9BA;
-moz-border-bottom-colors: #5D616E #99A9BA;
-moz-border-left-colors: #CED5DD #A6B3C0;
-moz-border-radius: 0;
padding: 1px;
min-height: 0px;
background-color: #A6B3C0;
color: #000000;
}
.menulist-compact > .menulist-label {
margin: 0 3px 0 0 !important;
text-align: right;
}
.menulist-compact > .menulist-dropmarker {
border: none;
background: transparent;
}
.menulist-compact > .menulist-dropmarker,
.menulist-compact[open="true"] > .menulist-dropmarker {
list-style-image: url("chrome://global/skin/menulist/mlist-compact-arrow.gif");
}
.menulist-compact:focus {
-moz-border-radius: 0;
}
.menulist-compact[open="true"] {
-moz-border-top-colors: #788797 #91A2B4;
-moz-border-right-colors: #5D616E #788797;
-moz-border-bottom-colors: #5D616E #788797;
-moz-border-left-colors: #788797 #91A2B4;
background-color: #91A2B4;
}

Просмотреть файл

@ -1,146 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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.org code.
*
* 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.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* ===== toolbarbutton.css ==============================================
== Styles used by XUL toolbarbutton elements.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: toolbarbutton ::::: */
toolbarbutton {
-moz-box-align: center;
-moz-box-pack: center;
border: 1px solid transparent;
padding: 1px 2px;
font: message-box;
}
.toolbarbutton-icon {
margin-right: 2px;
list-style-image: inherit;
}
.toolbarbutton-text {
margin: 0px !important;
text-align: center;
}
toolbarbutton:hover {
border-top-color: #EEF0F3;
border-right-color: #86929E;
border-bottom-color: #86929E;
border-left-color: #EEF0F3;
}
toolbarbutton:hover:active,
toolbarbutton[open="true"] {
border-top-color: #86929E;
border-right-color: #EEF0F3;
border-bottom-color: #EEF0F3;
border-left-color: #86929E;
padding: 2px 1px 0px 3px;
}
toolbarbutton[disabled="true"] {
border-color: transparent !important;
padding: 1px 2px !important;
color: #9399AB !important;
}
/* ..... checked state ..... */
toolbarbutton[checked="true"] {
border-top-color: #454C55 !important;
border-right-color: #7D848D !important;
border-bottom-color: #7D848D !important;
border-left-color: #454C55 !important;
background-color: #8C9AA8 !important;
color: #EFF1F4;
}
toolbarbutton[checked="true"]:hover:active {
padding: 1px 2px;
}
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/button/tbmenu-arrow.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/button/tbmenu-arrow-dis.gif");
}
.toolbarbutton-menu-dropmarker[open="true"] {
list-style-image: url("chrome://global/skin/button/tbmenu-arrow-act.gif");
}
/* ::::: toolbarbutton menu-button ::::: */
.toolbarbutton-menubutton-button {
font: inherit;
}
/* ..... dropmarker ..... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
-moz-box-pack: center;
margin: 20px 5px 15px 40px;
width: 13px;
height: 11px;
list-style-image: url("chrome://global/skin/button/tbmbtn-arrow.gif");
-moz-image-region: auto; /* cut off inheritance */
}
toolbarbutton:hover > stack > .toolbarbutton-menubutton-dropmarker {
list-style-image: url("chrome://global/skin/button/tbmbtn-arrow-hov.gif");
}
toolbarbutton[open="true"] > stack > .toolbarbutton-menubutton-dropmarker {
list-style-image: url("chrome://global/skin/button/tbmbtn-arrow-act.gif");
}
toolbarbutton[disabled="true"] > stack > .toolbarbutton-menubutton-dropmarker,
toolbarbutton[disabled="true"]:hover > stack > .toolbarbutton-menubutton-dropmarker
{
list-style-image: none;
}

Просмотреть файл

@ -158,6 +158,7 @@ modern.jar:
skin/modern/global/checkbox.css (global/checkbox.css)
skin/modern/global/colorpicker.css (global/colorpicker.css)
skin/modern/global/console.css (global/console.css)
skin/modern/global/dropmarker.css (global/dropmarker.css)
skin/modern/global/filepicker.css (global/filepicker.css)
skin/modern/global/formatting.css (global/formatting.css)
skin/modern/global/groupbox.css (global/groupbox.css)

Просмотреть файл

@ -867,20 +867,8 @@
</content>
</binding>
<binding id="history-dropmarker" extends="xul:button">
<content>
<xul:image class="dropmarker-image"/>
</content>
<implementation implements="nsIAccessibleProvider">
<property name="accessibleType" readonly="true">
<getter>
<![CDATA[
return Components.interfaces.nsIAccessibleProvider.XULDropmarker;
]]>
</getter>
</property>
<binding id="history-dropmarker" extends="chrome://global/content/bindings/general.xml#dropmarker">
<implementation>
<method name="showPopup">
<body><![CDATA[
var textbox = document.getBindingParent(this);

Просмотреть файл

@ -349,7 +349,11 @@
</implementation>
</binding>
<binding id="dropmarker">
<binding id="dropmarker" extends="xul:button">
<resources>
<stylesheet src="chrome://global/skin/dropmarker.css"/>
</resources>
<content>
<xul:image class="dropmarker-icon"/>
</content>

Просмотреть файл

@ -19,7 +19,7 @@
<xul:image class="menulist-icon" xbl:inherits="src"/>
<xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
</xul:hbox>
<xul:dropmarker class="menulist-dropmarker" type="menu"/>
<xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled"/>
<children includes="menupopup"/>
</content>

Просмотреть файл

@ -62,7 +62,6 @@
</content>
</binding>
<binding id="toolbarbutton-image"
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
<content>
@ -70,20 +69,4 @@
</content>
</binding>
<binding id="dropmarker">
<content>
<xul:image class="menubutton-dropmarker-icon"/>
</content>
<implementation implements="nsIAccessibleProvider">
<property name="accessibleType" readonly="true">
<getter>
<![CDATA[
return Components.interfaces.nsIAccessibleProvider.XULDropmarker;
]]>
</getter>
</property>
</implementation>
</binding>
</bindings>

Просмотреть файл

@ -136,10 +136,6 @@ toolbarbutton[type="menu-button"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
}
dropmarker[type="menu-button"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#dropmarker");
}
/******** browser, editor, iframe ********/
browser,
@ -871,7 +867,7 @@ menulist > menupopup > menuitem {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
}
dropmarker[type="menu"] {
dropmarker {
-moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
}

Просмотреть файл

@ -1,172 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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 the Initial Developer are Copyright (C) 1998-2001
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
* Brian Ryner <bryner@brianryner.com>
*
* 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
* 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
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* ===== autocomplete.css =================================================
== Styles used by the autocomplete widget.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
/* ::::: autocomplete ::::: */
textbox {
cursor: default;
padding: 0;
-moz-appearance: none;
border: none !important;
}
.autocomplete-textbox-container {
-moz-appearance: menulist-textfield;
-moz-box-align: center;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
}
/* Used by autocomplete widgets that don't have an icon. Gross. -dwh */
textbox.padded {
padding-top: 1px;
padding-bottom: 1px;
-moz-padding-start: 2px;
-moz-padding-end: 0px;
}
.textbox-input-box {
margin: 0 3px;
-moz-box-align: center;
}
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
-moz-appearance: menulist-button;
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.autocomplete-history-dropmarker:hover:active,
.autocomplete-history-dropmarker[open="true"] {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;
-moz-border-bottom-colors: ThreeDShadow ThreeDFace;
-moz-border-left-colors: ThreeDShadow ThreeDFace;
padding-top: 2px;
padding-bottom: 0px;
-moz-padding-start: 2px;
-moz-padding-end: 0px;
}
/* ::::: autocomplete popups ::::: */
popup[type="autocomplete"],
.autocomplete-history-popup {
border-width: 1px;
-moz-border-top-colors: ThreeDDarkShadow;
-moz-border-right-colors: ThreeDDarkShadow;
-moz-border-bottom-colors: ThreeDDarkShadow;
-moz-border-left-colors: ThreeDDarkShadow;
padding: 0;
background-color: -moz-Field !important;
}
.autocomplete-history-popup {
max-height: 180px;
}
/* ::::: tree ::::: */
.autocomplete-tree {
-moz-appearance: none !important;
border: none !important;
background-color: -moz-field !important;
}
.autocomplete-treecol {
-moz-appearance: none !important;
margin: 0 !important;
border: none !important;
padding: 0 !important;
}
.autocomplete-treebody::-moz-tree-cell-text {
-moz-padding-start: 8px;
}
treechildren.autocomplete-treebody::-moz-tree-row(selected) {
background-color: Highlight;
}
treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
color: HighlightText !important;
}
/* thunderbird does not use the new autocomplete widget yet so we need a couple of the old styles rules for it */
.autocomplete-treebody::-moz-tree-row(menuactive) {
background-color: Highlight;
}
.autocomplete-treebody::-moz-tree-cell-text(menuactive) {
color: HighlightText !important;
}
/* end of thunderbird required autocomplete rules */
/* ::::: textboxes inside toolbarpaletteitems ::::: */
toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input {
visibility: hidden;
}
toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input {
visibility: hidden;
}

Просмотреть файл

@ -154,19 +154,14 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
-moz-appearance: none !important;
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
background-repeat: no-repeat;
background-position: center center;
background-color: transparent !important;
border: none !important;
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin-top: 2px;
margin-bottom: 0px;

Просмотреть файл

@ -125,12 +125,9 @@ toolbarbutton[checked="true"]:hover:active {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
/* ::::: toolbarbutton menu-button ::::: */
@ -161,17 +158,8 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
border: none !important;
background-color: transparent !important;
padding: 3px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
-moz-appearance: dualbutton-dropdown;
}
.toolbarbutton-menubutton-dropmarker[disabled="true"] {
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 {
-moz-appearance: dualbutton-dropdown !important;
}

Просмотреть файл

@ -64,9 +64,9 @@ textbox.padded {
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
padding: 0px;
list-style-image: url("chrome://global/skin/icons/autocomplete-dropmarker.png");
margin: 0px;

Просмотреть файл

@ -92,17 +92,10 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
margin: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
}
.button-menubutton-dropmarker[open="true"] {
/* margin: 2px 0px 0px 2px; */
}
/* ::::: plain buttons ::::: */

Просмотреть файл

@ -0,0 +1,32 @@
dropmarker {
-moz-appearance: menulist-button;
width: 16px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto;
}
dropmarker:hover:active {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;
-moz-border-bottom-colors: ThreeDShadow ThreeDFace;
-moz-border-left-colors: ThreeDShadow ThreeDFace;
padding: 2px 0 0 2px;
}
dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight !important;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
padding: 1px !important;
}

Просмотреть файл

@ -81,6 +81,7 @@ button[dlgtype="help"]:active > .button-box > .button-icon {
button[dlgtype="help"] > .button-box > .button-text {
display: none !important;
}
/* ::::: XBL bindings ::::: */
menulist > menupopup,

Просмотреть файл

@ -19,6 +19,7 @@ classic.jar:
+ skin/classic/global/config.css
+ skin/classic/global/customizeToolbar.css
+ skin/classic/global/dialog.css
+ skin/classic/global/dropmarker.css
+ skin/classic/global/filepicker.css
+ skin/classic/global/formatting.css
+ skin/classic/global/findBar.css

Просмотреть файл

@ -73,7 +73,7 @@ border: 1px solid blue;
/* ..... dropmarker ..... */
.menulist-dropmarker {
-moz-appearance: menulist-button;
display: none;
}
/* ..... disabled state ..... */

Просмотреть файл

@ -93,15 +93,12 @@ toolbarbutton[checked="true"] {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
-moz-image-region: auto; /* cut off inheritance */
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
padding-left: 2px;
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
}
/* ::::: toolbarbutton menu-button ::::: */
toolbarbutton[type="menu-button"] {
@ -129,14 +126,9 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
-moz-box-pack: center;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menubutton-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
toolbarbutton.tabbable {

Просмотреть файл

@ -69,22 +69,6 @@ textbox.padded {
/* ::::: history button ::::: */
.autocomplete-history-dropmarker {
-moz-appearance: menulist-button;
min-width: 17px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.autocomplete-history-dropmarker:hover:active,
.autocomplete-history-dropmarker[open="true"] {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;

Просмотреть файл

@ -140,19 +140,14 @@ button[type="menu-button"] {
.button-menu-dropmarker,
.button-menubutton-dropmarker {
-moz-appearance: none !important;
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
background-repeat: no-repeat;
background-position: center center;
background-color: transparent !important;
border: none !important;
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin-top: 2px;
margin-bottom: 0px;

Просмотреть файл

@ -0,0 +1,35 @@
dropmarker {
-moz-appearance: menulist-button;
width: 16px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
background-color: -moz-Dialog;
padding: 1px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto;
}
dropmarker:hover:active {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;
-moz-border-bottom-colors: ThreeDShadow ThreeDFace;
-moz-border-left-colors: ThreeDShadow ThreeDFace;
padding-top: 2px;
padding-bottom: 0px;
-moz-padding-start: 2px;
-moz-padding-end: 0px;
}
dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight !important;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow !important;
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight !important;
padding: 1px !important;
}

Просмотреть файл

@ -10,6 +10,7 @@ classic.jar:
skin/classic/global/config.css
skin/classic/global/customizeToolbar.css
skin/classic/global/dialog.css
skin/classic/global/dropmarker.css
skin/classic/global/expander.css
skin/classic/global/filepicker.css
skin/classic/global/findBar.css

Просмотреть файл

@ -90,17 +90,6 @@ menulist[open="true"]:focus > .menulist-label-box {
/* ..... dropmarker ..... */
.menulist-dropmarker {
-moz-appearance: menulist-button;
min-width: 16px;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
background-color: -moz-Dialog;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
.menulist-dropmarker,
menulist[disabled="true"]:hover:active > .menulist-dropmarker {
-moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
@ -109,10 +98,6 @@ menulist[disabled="true"]:hover:active > .menulist-dropmarker {
padding: 1px;
}
menulist[disabled="true"] > .menulist-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
menulist:hover:active > .menulist-dropmarker {
-moz-border-top-colors: ThreeDShadow ThreeDFace;
-moz-border-right-colors: ThreeDShadow ThreeDFace;

Просмотреть файл

@ -115,12 +115,9 @@ toolbarbutton[checked="true"] {
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-moz-appearance: none !important;
border: none !important;
background-color: transparent !important;
}
/* ::::: toolbarbutton menu-button ::::: */
@ -150,16 +147,8 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
-moz-appearance: none !important;
padding: 3px;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menubutton-dropmarker[disabled="true"] {
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 {
border: none !important;
background-color: transparent !important;
}

Просмотреть файл

@ -1711,20 +1711,9 @@
</handlers>
</binding>
<binding id="history-dropmarker" extends="xul:button">
<content>
<xul:image class="dropmarker-image"/>
</content>
<implementation implements="nsIAccessibleProvider">
<property name="accessibleType" readonly="true">
<getter>
<![CDATA[
return Components.interfaces.nsIAccessibleProvider.XULDropmarker;
]]>
</getter>
</property>
<binding id="history-dropmarker" extends="chrome://global/content/bindings/general.xml#dropmarker">
<implementation>
<method name="showPopup">
<body><![CDATA[
var textbox = document.getBindingParent(this);

Просмотреть файл

@ -349,7 +349,11 @@
</implementation>
</binding>
<binding id="dropmarker">
<binding id="dropmarker" extends="xul:button">
<resources>
<stylesheet src="chrome://global/skin/dropmarker.css"/>
</resources>
<content>
<xul:image class="dropmarker-icon"/>
</content>

Просмотреть файл

@ -19,7 +19,7 @@
<xul:image class="menulist-icon" xbl:inherits="src"/>
<xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
</xul:hbox>
<xul:dropmarker class="menulist-dropmarker" type="menu"/>
<xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled"/>
<children includes="menupopup"/>
</content>

Просмотреть файл

@ -69,21 +69,4 @@
<xul:image class="toolbarbutton-icon" xbl:inherits="src=image"/>
</content>
</binding>
<binding id="dropmarker">
<content>
<xul:image class="menubutton-dropmarker-icon"/>
</content>
<implementation implements="nsIAccessibleProvider">
<property name="accessibleType" readonly="true">
<getter>
<![CDATA[
return Components.interfaces.nsIAccessibleProvider.XULDropmarker;
]]>
</getter>
</property>
</implementation>
</binding>
</bindings>

Просмотреть файл

@ -135,10 +135,6 @@ toolbarbutton[type="menu-button"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
}
dropmarker[type="menu-button"] {
-moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#dropmarker");
}
/******** browser, editor, iframe ********/
browser,
@ -725,7 +721,7 @@ menulist > menupopup > menuitem {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
}
dropmarker[type="menu"] {
dropmarker {
-moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
}