зеркало из https://github.com/mozilla/pjs.git
Bug 244886 Reuse <menulist type="description"> in Compose window p=Stefan.Borggraefe@gmx.de r=mscott sr=me
This commit is contained in:
Родитель
921c9dffa3
Коммит
1ab583960d
|
@ -1232,12 +1232,11 @@ function ComposeStartup(recycled, aParams)
|
|||
}
|
||||
|
||||
var identityList = document.getElementById("msgIdentity");
|
||||
var identityListPopup = document.getElementById("msgIdentityPopup");
|
||||
|
||||
document.addEventListener("keypress", awDocumentKeyPress, true);
|
||||
|
||||
if (identityListPopup)
|
||||
FillIdentityListPopup(identityListPopup);
|
||||
if (identityList)
|
||||
FillIdentityList(identityList);
|
||||
|
||||
if (!params) {
|
||||
// This code will go away soon as now arguments are passed to the window using a object of type nsMsgComposeParams instead of a string
|
||||
|
@ -2334,7 +2333,7 @@ function compareAccountSortOrder(account1, account2)
|
|||
return 0;
|
||||
}
|
||||
|
||||
function FillIdentityListPopup(popup)
|
||||
function FillIdentityList(menulist)
|
||||
{
|
||||
var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
|
||||
accounts.sort(compareAccountSortOrder);
|
||||
|
@ -2346,13 +2345,8 @@ function FillIdentityListPopup(popup)
|
|||
var identites = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
|
||||
for (var j in identites) {
|
||||
var identity = identites[j];
|
||||
var item = document.createElement("menuitem");
|
||||
item.className = "identity-popup-item";
|
||||
item.setAttribute("label", identity.identityName);
|
||||
item.setAttribute("value", identity.key);
|
||||
var item = menulist.appendItem(identity.identityName, identity.key, server.prettyName);
|
||||
item.setAttribute("accountkey", accounts[i].key);
|
||||
item.setAttribute("accountname", " - " + server.prettyName);
|
||||
popup.appendChild(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -697,7 +697,7 @@
|
|||
<vbox flex="1" id="addresses-box">
|
||||
<hbox align="center">
|
||||
<label value="&fromAddr.label;" accesskey="&fromAddr.accesskey;" control="msgIdentity"/>
|
||||
<menulist id="msgIdentity" class="identity-menulist" label="..." flex="1" oncommand="LoadIdentity(false);">
|
||||
<menulist id="msgIdentity" type="description" flex="1" oncommand="LoadIdentity(false);">
|
||||
<menupopup id="msgIdentityPopup"/>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
|
|
@ -387,19 +387,6 @@ treechildren::-moz-tree-image(remote-err) {
|
|||
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
|
||||
}
|
||||
|
||||
.identity-menulist {
|
||||
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuList);
|
||||
}
|
||||
|
||||
.identity-popup-item {
|
||||
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem);
|
||||
}
|
||||
|
||||
.composemenu-text-2 {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
}
|
||||
|
||||
/* ::::: addressing widget ::::: */
|
||||
|
||||
#addressingWidget {
|
||||
|
|
|
@ -374,18 +374,6 @@ treechildren::-moz-tree-image(remote-err) {
|
|||
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
|
||||
}
|
||||
|
||||
.identity-menulist {
|
||||
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuList);
|
||||
}
|
||||
|
||||
.identity-popup-item {
|
||||
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem);
|
||||
}
|
||||
|
||||
.composemenu-text-2 {
|
||||
color: #555566;
|
||||
}
|
||||
|
||||
/* ::::: addressing widget ::::: */
|
||||
|
||||
.autocomplete-treebody::-moz-tree-cell-text(comment) {
|
||||
|
|
|
@ -1231,12 +1231,11 @@ function ComposeStartup(recycled, aParams)
|
|||
}
|
||||
|
||||
var identityList = document.getElementById("msgIdentity");
|
||||
var identityListPopup = document.getElementById("msgIdentityPopup");
|
||||
|
||||
document.addEventListener("keypress", awDocumentKeyPress, true);
|
||||
|
||||
if (identityListPopup)
|
||||
FillIdentityListPopup(identityListPopup);
|
||||
if (identityList)
|
||||
FillIdentityList(identityList);
|
||||
|
||||
if (!params) {
|
||||
// This code will go away soon as now arguments are passed to the window using a object of type nsMsgComposeParams instead of a string
|
||||
|
@ -2183,7 +2182,7 @@ function compareAccountSortOrder(account1, account2)
|
|||
return 0;
|
||||
}
|
||||
|
||||
function FillIdentityListPopup(popup)
|
||||
function FillIdentityList(menulist)
|
||||
{
|
||||
var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
|
||||
accounts.sort(compareAccountSortOrder);
|
||||
|
@ -2195,13 +2194,8 @@ function FillIdentityListPopup(popup)
|
|||
var identites = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
|
||||
for (var j in identites) {
|
||||
var identity = identites[j];
|
||||
var item = document.createElement("menuitem");
|
||||
item.className = "identity-popup-item";
|
||||
item.setAttribute("label", identity.identityName);
|
||||
item.setAttribute("value", identity.key);
|
||||
var item = menulist.appendItem(identity.identityName, identity.key, server.prettyName);
|
||||
item.setAttribute("accountkey", accounts[i].key);
|
||||
item.setAttribute("accountname", " - " + server.prettyName);
|
||||
popup.appendChild(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -488,7 +488,7 @@
|
|||
<vbox flex="1" id="addresses-box">
|
||||
<hbox align="center">
|
||||
<label value="&fromAddr.label;" accesskey="&fromAddr.accesskey;" control="msgIdentity"/>
|
||||
<menulist id="msgIdentity" label="..." flex="1" oncommand="LoadIdentity(false);">
|
||||
<menulist id="msgIdentity" type="description" flex="1" oncommand="LoadIdentity(false);">
|
||||
<menupopup id="msgIdentityPopup"/>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
|
|
@ -175,7 +175,6 @@ messenger.jar:
|
|||
content/messenger/messengercompose/askSendFormat.xul (compose/resources/content/askSendFormat.xul)
|
||||
content/messenger/messengercompose/sendProgress.xul (compose/resources/content/sendProgress.xul)
|
||||
content/messenger/messengercompose/sendProgress.js (compose/resources/content/sendProgress.js)
|
||||
content/messenger/messengercompose/mailComposeBindings.xml (compose/resources/content/mailComposeBindings.xml)
|
||||
content/messenger/messengercompose/MsgAttachPage.xul (compose/resources/content/MsgAttachPage.xul)
|
||||
content/messenger/messengercompose/MsgAttachPage.js (compose/resources/content/MsgAttachPage.js)
|
||||
content/messenger/messengercompose/mailComposeExtrasOverlay.xul (compose/resources/content/mailComposeExtrasOverlay.xul)
|
||||
|
|
|
@ -182,11 +182,3 @@ 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: GrayText;
|
||||
}
|
||||
|
|
|
@ -1,212 +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>
|
||||
* Dan Mosedale <dmose@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 ***** */
|
||||
|
||||
/* ===== messengercompose.css ===========================================
|
||||
== Styles for the main Messenger Compose window.
|
||||
======================================================================= */
|
||||
|
||||
@import url("chrome://messenger/skin/");
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
/* ::::: primary toolbar masthead ::::: */
|
||||
|
||||
#composeToolbar > .toolbar-holder > .toolbar-primary-icon {
|
||||
background-image: url("chrome://messenger/skin/messengercompose/icons/mast-msgcomp.gif");
|
||||
}
|
||||
|
||||
/* ::::: primary toolbar buttons ::::: */
|
||||
|
||||
.toolbarbutton-1 {
|
||||
list-style-image: url("chrome://messenger/skin/icons/btn1.gif");
|
||||
}
|
||||
|
||||
#button-send {
|
||||
-moz-image-region: rect(374px 49px 407px 0);
|
||||
}
|
||||
|
||||
#button-send:hover {
|
||||
-moz-image-region: rect(374px 99px 407px 50px);
|
||||
}
|
||||
|
||||
#button-send:hover:active {
|
||||
-moz-image-region: rect(374px 149px 407px 100px);
|
||||
}
|
||||
|
||||
#button-send[disabled="true"] {
|
||||
-moz-image-region: rect(374px 199px 407px 150px) !important;
|
||||
}
|
||||
|
||||
#button-address {
|
||||
-moz-image-region: rect(306px 49px 339px 0);
|
||||
}
|
||||
|
||||
#button-address:hover {
|
||||
-moz-image-region: rect(306px 99px 339px 50px);
|
||||
}
|
||||
|
||||
#button-address:hover:active {
|
||||
-moz-image-region: rect(306px 149px 339px 100px);
|
||||
}
|
||||
|
||||
#button-address[disabled="true"] {
|
||||
-moz-image-region: rect(306px 199px 339px 150px) !important;
|
||||
}
|
||||
|
||||
#button-attach {
|
||||
-moz-image-region: rect(340px 49px 373px 0);
|
||||
}
|
||||
|
||||
#button-attach:hover {
|
||||
-moz-image-region: rect(340px 99px 373px 50px);
|
||||
}
|
||||
|
||||
#button-attach:hover:active {
|
||||
-moz-image-region: rect(340px 149px 373px 100px);
|
||||
}
|
||||
|
||||
#button-attach[disabled="true"] {
|
||||
-moz-image-region: rect(340px 199px 373px 150px) !important;
|
||||
}
|
||||
|
||||
#spellingButton {
|
||||
list-style-image: url("chrome://editor/skin/icons/btn1.gif");
|
||||
-moz-image-region: rect(272px 49px 305px 0);
|
||||
}
|
||||
|
||||
#spellingButton:hover {
|
||||
-moz-image-region: rect(272px 99px 305px 50px);
|
||||
}
|
||||
|
||||
#spellingButton:hover:active {
|
||||
-moz-image-region: rect(272px 149px 305px 100px);
|
||||
}
|
||||
|
||||
#spellingButton[disabled="true"] {
|
||||
-moz-image-region: rect(272px 199px 305px 150px) !important;
|
||||
}
|
||||
|
||||
#button-save {
|
||||
list-style-image: url("chrome://editor/skin/icons/btn1.gif");
|
||||
-moz-image-region: rect(238px 49px 271px 0);
|
||||
}
|
||||
|
||||
#button-save:hover {
|
||||
-moz-image-region: rect(238px 99px 271px 50px);
|
||||
}
|
||||
|
||||
#button-save:hover:active {
|
||||
-moz-image-region: rect(238px 149px 271px 100px);
|
||||
}
|
||||
|
||||
#button-save[disabled="true"] {
|
||||
-moz-image-region: rect(238px 199px 271px 150px) !important;
|
||||
}
|
||||
|
||||
/* ::::: special toolbar colors ::::: */
|
||||
|
||||
#MsgHeadersToolbar {
|
||||
background: #B1BDC9;
|
||||
}
|
||||
|
||||
#FormatToolbar {
|
||||
background: url("chrome://global/skin/toolbar/tb-mid.gif") #C7D0D9 repeat-x top;
|
||||
}
|
||||
|
||||
#MsgHeadersToolbar > toolbargrippy,
|
||||
#MsgHeadersToolbar > .toolbar-holder,
|
||||
#FormatToolbar > toolbargrippy,
|
||||
#FormatToolbar > .toolbar-holder {
|
||||
border-top: 1px solid #CED6DD;
|
||||
border-right: 1px solid #95A0AD;
|
||||
border-bottom: 1px solid #95A0AD;
|
||||
border-left: 1px solid #DAE3ED;
|
||||
}
|
||||
|
||||
#MsgHeadersToolbar > toolbargrippy:hover:active,
|
||||
#FormatToolbar > toolbargrippy:hover:active {
|
||||
border-color: #67737E;
|
||||
}
|
||||
|
||||
.toolbox-top {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
#attachmentbucket-sizer {
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
background-color: #B1BDC9;
|
||||
}
|
||||
|
||||
#compose-toolbar-sizer {
|
||||
border-top-width: 1px;
|
||||
-moz-border-top-colors: #EEF0F3;
|
||||
}
|
||||
|
||||
/* ::::: autocomplete icons ::::: */
|
||||
|
||||
treechildren::-moz-tree-cell-text(default-match) {
|
||||
margin: 2px -3px 2px 15px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
treechildren::-moz-tree-image(local-abook) {
|
||||
margin: 2px -3px 2px 4px;
|
||||
list-style-image: url("chrome://messenger/skin/addressbook/icons/myaddrbk.gif");
|
||||
}
|
||||
|
||||
treechildren::-moz-tree-image(remote-abook) {
|
||||
margin: 2px -4px 2px 3px;
|
||||
list-style-image: url("chrome://messenger/skin/addressbook/icons/directory.gif");
|
||||
}
|
||||
|
||||
treechildren::-moz-tree-image(remote-err) {
|
||||
margin: 2px -4px 2px 3px;
|
||||
list-style-image: url("chrome://messenger/skin/addressbook/icons/directory-down.gif");
|
||||
}
|
||||
|
||||
.identity-popup-item
|
||||
{
|
||||
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem);
|
||||
}
|
||||
|
||||
.composemenu-text-2
|
||||
{
|
||||
font-style: italic;
|
||||
color: #8C99AB;
|
||||
}
|
|
@ -113,6 +113,12 @@ menulist > menupopup > menu {
|
|||
font-weight: inherit;
|
||||
}
|
||||
|
||||
.menu-description {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
-moz-margin-start: 1ex !important;
|
||||
}
|
||||
|
||||
.menu-accel,
|
||||
.menu-iconic-accel {
|
||||
margin-top: 0px !important;
|
||||
|
|
|
@ -75,6 +75,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
|
|||
font-weight: inherit;
|
||||
}
|
||||
|
||||
.menu-description {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
-moz-margin-start: 1ex !important;
|
||||
}
|
||||
|
||||
.menu-accel,
|
||||
.menu-iconic-accel {
|
||||
margin: 0px 2px 0px 7px !important;
|
||||
|
|
|
@ -64,6 +64,12 @@ border: 1px solid blue;
|
|||
margin: 1px 3px !important;
|
||||
}
|
||||
|
||||
.menulist-description {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
-moz-margin-start: 1ex !important;
|
||||
}
|
||||
|
||||
/* ..... dropmarker ..... */
|
||||
|
||||
.menulist-dropmarker {
|
||||
|
|
|
@ -1,279 +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-1999
|
||||
* 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 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 ***** */
|
||||
|
||||
/* ===== menu.css =======================================================
|
||||
== Styles used by XUL menu-related elements.
|
||||
======================================================================= */
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
/* ::::: menu/menuitem ::::: */
|
||||
|
||||
menu,
|
||||
menuitem {
|
||||
-moz-box-align: center;
|
||||
color: MenuText;
|
||||
font: menu;
|
||||
list-style-image: none;
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
menuitem[default="true"] {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
menu[disabled="true"], menuitem[disabled="true"],
|
||||
menu[_moz-menuactive="true"][disabled="true"],
|
||||
menuitem[_moz-menuactive="true"][disabled="true"] {
|
||||
color: GrayText;
|
||||
}
|
||||
|
||||
/* ..... internal content .... */
|
||||
|
||||
.menu-text,
|
||||
.menu-iconic-left,
|
||||
.menu-iconic-text {
|
||||
margin-top: 0px !important;
|
||||
margin-bottom: 0px !important;
|
||||
-moz-margin-start: 0px !important;
|
||||
-moz-margin-end: 2px !important;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.menu-text {
|
||||
-moz-margin-start: 18px !important;
|
||||
font-weight: inherit;
|
||||
}
|
||||
|
||||
.menu-accel,
|
||||
.menu-iconic-accel {
|
||||
margin-top: 0px !important;
|
||||
margin-bottom: 0px !important;
|
||||
-moz-margin-start: 7px !important;
|
||||
-moz-margin-end: 2px !important;
|
||||
-moz-padding-end: 14px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.menu-iconic-left {
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
/* ..... menu arrow box ..... */
|
||||
|
||||
.menu-right {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
-moz-margin-start: 6px;
|
||||
-moz-margin-end: 0px;
|
||||
width: 8px;
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow.png");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
.menu-right[_moz-menuactive="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow-hover.png");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
.menu-right[disabled="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow-disabled.png") !important;
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
.menu-right[chromedir="rtl"] {
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow-rtl.png");
|
||||
}
|
||||
|
||||
.menu-right[chromedir="rtl"][_moz-menuactive="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow-hover-rtl.png");
|
||||
}
|
||||
|
||||
.menu-right[chromedir="rtl"][disabled="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/Menu-arrow-disabled-rtl.png") !important;
|
||||
}
|
||||
|
||||
/* ::::: menu/menuitems in menubar ::::: */
|
||||
|
||||
menubar > menu {
|
||||
border: 1px solid transparent;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
-moz-padding-start: 7px;
|
||||
-moz-padding-end: 5px;
|
||||
margin: 1px 0px 1px 0px;
|
||||
}
|
||||
menubar > menu[_moz-menuactive="true"] {
|
||||
border-top: 1px solid ThreeDHighlight;
|
||||
border-right: 1px solid ThreeDShadow;
|
||||
border-bottom: 1px solid ThreeDShadow;
|
||||
border-left: 1px solid ThreeDHighlight;
|
||||
}
|
||||
menubar > menu[_moz-menuactive="true"][open="true"] {
|
||||
border-top: 1px solid ThreeDShadow;
|
||||
border-right: 1px solid ThreeDHighlight;
|
||||
border-bottom: 1px solid ThreeDHighlight;
|
||||
border-left: 1px solid ThreeDShadow;
|
||||
}
|
||||
|
||||
/* ..... internal content .... */
|
||||
|
||||
.menubar-left {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
-moz-margin-start: 0px;
|
||||
-moz-margin-end: 2px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.menubar-text {
|
||||
margin-top: 0px !important;
|
||||
margin-bottom: 0px !important;
|
||||
-moz-margin-start: 0px !important;
|
||||
-moz-margin-end: 2px !important;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
/* ::::: menu/menuitems in popups ::::: */
|
||||
|
||||
menupopup > menu,
|
||||
popup > menu,
|
||||
menupopup > menuitem,
|
||||
popup > menuitem {
|
||||
padding: 2px;
|
||||
max-width: 42em;
|
||||
}
|
||||
|
||||
menupopup > menu[_moz-menuactive="true"],
|
||||
menupopup > menuitem[_moz-menuactive="true"],
|
||||
popup > menu[_moz-menuactive="true"],
|
||||
popup > menuitem[_moz-menuactive="true"] {
|
||||
background-color: Highlight;
|
||||
color: HighlightText;
|
||||
}
|
||||
|
||||
/* ::::: menu/menuitems in menulist popups ::::: */
|
||||
|
||||
.menulist-menupopup > menuitem,
|
||||
menulist > menupopup > menuitem,
|
||||
.menulist-menupopup > menu,
|
||||
menulist > menupopup > menu {
|
||||
border: 1px solid transparent;
|
||||
padding-top: 1px;
|
||||
padding-bottom: 1px;
|
||||
-moz-padding-start: 5px;
|
||||
-moz-padding-end: 30px;
|
||||
max-width: none;
|
||||
font: message-box;
|
||||
color: -moz-FieldText;
|
||||
}
|
||||
|
||||
.menulist-menupopup > menuitem > .menu-iconic-left,
|
||||
menulist > menupopup > menuitem > .menu-iconic-left,
|
||||
.menulist-menupopup > menu > .menu-iconic-left,
|
||||
menulist > menupopup > menu > .menu-iconic-left {
|
||||
display: none;
|
||||
}
|
||||
|
||||
menulist > menupopup > menuitem[_moz-menuactive="true"] {
|
||||
border: 1px dotted #F5DB95;
|
||||
}
|
||||
|
||||
/* ::::: checkbox menuitem ::::: */
|
||||
|
||||
menuitem[checked="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-check.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
menuitem[checked="true"][disabled="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
menuitem[checked="true"][_moz-menuactive="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
/* ::::: radio menuitem ::::: */
|
||||
|
||||
menuitem[checked="true"][type="radio"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-radio.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][disabled="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
menuitem[checked="true"][type="radio"][_moz-menuactive="true"] {
|
||||
list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
||||
|
||||
/* ::::: menuseparator ::::: */
|
||||
|
||||
menuseparator {
|
||||
margin: 2px 3px;
|
||||
border-top: 1px solid ThreeDShadow;
|
||||
border-bottom: 1px solid ThreeDHighlight;
|
||||
}
|
||||
|
||||
menulist > menupopup > menuseparator,
|
||||
.menulist-menupopup > menuseparator {
|
||||
margin: 2px 0;
|
||||
border-top: 1px solid #000000;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
/* ::::: autocomplete ::::: */
|
||||
|
||||
.autocomplete-history-popup > menuitem {
|
||||
max-width: none !important;
|
||||
font: message-box;
|
||||
}
|
||||
|
||||
/* ::::: tree column picker ::::: */
|
||||
|
||||
.treecell-popupcell-menu {
|
||||
-moz-margin-start: -2px;
|
||||
list-style-image: url("chrome://global/skin/columnselect.gif");
|
||||
-moz-image-region: auto;
|
||||
}
|
|
@ -1,183 +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-1999
|
||||
* 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 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");
|
||||
|
||||
/* :::::::::: menulist :::::::::: */
|
||||
|
||||
menulist {
|
||||
-moz-appearance: menulist;
|
||||
margin: 2px 4px;
|
||||
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;
|
||||
background-color: -moz-Field;
|
||||
color: -moz-FieldText;
|
||||
}
|
||||
|
||||
.menulist-label-box {
|
||||
-moz-box-align: center;
|
||||
-moz-box-pack: center;
|
||||
margin: 1px;
|
||||
}
|
||||
|
||||
.menulist-label-box,
|
||||
menulist[open="true"]:focus > .menulist-label-box {
|
||||
border: 1px solid transparent;
|
||||
background-color: transparent;
|
||||
color: inherit;
|
||||
-moz-box-align: center;
|
||||
}
|
||||
|
||||
.menulist-icon[src] {
|
||||
margin: 0px 2px 0px 2px;
|
||||
}
|
||||
|
||||
.menulist-label {
|
||||
margin: 1px 3px !important;
|
||||
}
|
||||
|
||||
/* ..... 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;
|
||||
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
|
||||
-moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
|
||||
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;
|
||||
-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;
|
||||
}
|
||||
|
||||
/* ..... focused state ..... */
|
||||
|
||||
menulist:focus > .menulist-label-box {
|
||||
border: 1px dotted #F5DB95;
|
||||
background-color: Highlight;
|
||||
color: HighlightText;
|
||||
}
|
||||
|
||||
/* ..... disabled state ..... */
|
||||
|
||||
menulist[disabled="true"] {
|
||||
background-color: -moz-Dialog;
|
||||
color: GrayText;
|
||||
}
|
||||
|
||||
/* ::::: editable menulists ::::: */
|
||||
|
||||
.menulist-editable-box {
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
-moz-padding-start: 2px;
|
||||
-moz-padding-end: 0px;
|
||||
}
|
||||
|
||||
html|*.menulist-editable-input {
|
||||
margin: 0px !important;
|
||||
border: none !important;
|
||||
padding: 0px !important;
|
||||
background: inherit;
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
/* ::::: compact menulists ::::: */
|
||||
|
||||
.menulist-compact {
|
||||
-moz-box-align: center;
|
||||
-moz-box-pack: center;
|
||||
margin: 0;
|
||||
-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;
|
||||
color: -moz-DialogText;
|
||||
}
|
||||
|
||||
.menulist-compact > .menulist-label {
|
||||
margin: 0 3px !important;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.menulist-compact > .menulist-dropmarker {
|
||||
-moz-margin-start: 2px;
|
||||
border: none;
|
||||
padding: 0 !important;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.menulist-compact[open="true"] {
|
||||
-moz-border-top-colors: ThreeDDarkShadow ThreeDShadow;
|
||||
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
|
||||
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
|
||||
-moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
|
||||
background-color: ThreeDShadow;
|
||||
color: ThreeDHighlight;
|
||||
}
|
|
@ -90,6 +90,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
|
|||
font-weight: inherit;
|
||||
}
|
||||
|
||||
.menu-description {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
-moz-margin-start: 1ex !important;
|
||||
}
|
||||
|
||||
.menu-accel,
|
||||
.menu-iconic-accel {
|
||||
-moz-margin-end: 19px !important;
|
||||
|
|
|
@ -82,6 +82,12 @@ menulist[open="true"]:focus > .menulist-label-box {
|
|||
-moz-margin-start: 1px !important;
|
||||
}
|
||||
|
||||
.menulist-description {
|
||||
font-style: italic;
|
||||
color: GrayText;
|
||||
-moz-margin-start: 1ex !important;
|
||||
}
|
||||
|
||||
/* ..... dropmarker ..... */
|
||||
|
||||
.menulist-dropmarker {
|
||||
|
|
Загрузка…
Ссылка в новой задаче