From eb3e679fe698c67b3137e92eedd574a12e2df861 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Wed, 15 Mar 2006 19:25:19 +0000 Subject: [PATCH] Line ending issues git-svn-id: svn://10.0.0.236/trunk@192435 18797224-902f-48f8-a5cc-f745e15eee43 --- .../themes/pmstripe/global/Makefile.in | 94 ++-- mozilla/toolkit/themes/pmstripe/global/jar.mn | 10 +- .../toolkit/themes/pmstripe/global/menu.css | 492 +++++++++--------- .../toolkit/themes/pmstripe/global/popup.css | 234 ++++----- .../themes/pmstripe/global/toolbar.css | 318 +++++------ 5 files changed, 574 insertions(+), 574 deletions(-) diff --git a/mozilla/toolkit/themes/pmstripe/global/Makefile.in b/mozilla/toolkit/themes/pmstripe/global/Makefile.in index ca8586b972e..e2e14ca92d3 100755 --- a/mozilla/toolkit/themes/pmstripe/global/Makefile.in +++ b/mozilla/toolkit/themes/pmstripe/global/Makefile.in @@ -1,47 +1,47 @@ -# ***** 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 build system. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 2002 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Brian Ryner -# Pierre Chanial -# -# 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 ***** - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - +# ***** 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 build system. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 2002 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Brian Ryner +# Pierre Chanial +# +# 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 ***** + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/toolkit/themes/pmstripe/global/jar.mn b/mozilla/toolkit/themes/pmstripe/global/jar.mn index 6ba83cf801f..566458c2abb 100755 --- a/mozilla/toolkit/themes/pmstripe/global/jar.mn +++ b/mozilla/toolkit/themes/pmstripe/global/jar.mn @@ -1,5 +1,5 @@ -classic.jar: -+ skin/classic/global/popup.css -+ skin/classic/global/menu.css -+ skin/classic/global/toolbar.css - +classic.jar: ++ skin/classic/global/popup.css ++ skin/classic/global/menu.css ++ skin/classic/global/toolbar.css + diff --git a/mozilla/toolkit/themes/pmstripe/global/menu.css b/mozilla/toolkit/themes/pmstripe/global/menu.css index acdb065ecef..a98c263e9d5 100755 --- a/mozilla/toolkit/themes/pmstripe/global/menu.css +++ b/mozilla/toolkit/themes/pmstripe/global/menu.css @@ -1,246 +1,246 @@ -/* ***** 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) - * Peter Weilbacher (mozilla@Weilbacher.org) - * - * 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-appearance: menuitem; - -moz-box-align: center; - color: MenuText; - background-color: Menu; - font: menu; - list-style-image: none; - -moz-image-region: auto; -} - -menuitem[type="checkbox"] { - -moz-appearance: checkmenuitem; -} - -menuitem[type="radio"] { - -moz-appearance: radiomenuitem; -} - -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; -} - -menuitem.spell-suggestion { - font-weight:bold; -} - -/* ..... internal content .... */ - -.menu-accel, -.menu-iconic-accel, -.menu-text, -.menu-iconic-text { - margin-top: 0 !important; - margin-bottom: 0 !important; - -moz-margin-start: 0px !important; - -moz-margin-end: 0px !important; - color: inherit; -} - -.menu-text { - -moz-margin-start: 17px !important; - 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; - -moz-margin-start: 8px !important; - color: inherit; -} - -.menu-iconic-text { - -moz-margin-start: 2px !important; -} - -.menu-iconic-left { - padding: 1px; - min-width: 15px; - min-height: 15px; -} - -/* ..... menu arrow box ..... */ - -.menu-right { - margin-top: 2px; - margin-bottom: 3px; - -moz-padding-end: 6px; - list-style-image: none; - -moz-image-region: auto; -} - -/* ::::: menu/menuitems in menubar ::::: */ - -menubar > menu { - border: 1px solid transparent; - -moz-margin-start: 2px; - -moz-margin-end: 3px; - margin-top: 1px; - margin-bottom: 0; -} - -menubar > menu[_moz-menuactive="true"][open="true"] { - border: 1px solid transparent; - -moz-margin-start: 2px; - -moz-margin-end: 3px; - margin-top: 1px; - margin-bottom: 0; - color: -moz-MenuBarHoverText; - background-color: -moz-MenuHover; -} - -/* ..... internal content .... */ - -.menubar-left { - color: inherit; -} - -.menubar-text { - color: inherit; -} - -/* menu[_moz-menuactive="true"][open="true"] > .menubar-text { - -moz-margin-start: 2 !important; - -moz-margin-end: 2 !important; */ - /* border: 0 5px 0 3px solid -moz-MenuHover !important; */ - /* padding: 0 2px 0 3px !important; */ -/* } */ - -/* ::::: menu/menuitems in popups ::::: */ - -menupopup > menu, -popup > menu, -menupopup > menuitem, -popup > menuitem { - max-width: 42em; -} - -menupopup > menu[_moz-menuactive="true"], -menupopup > menuitem[_moz-menuactive="true"], -popup > menu[_moz-menuactive="true"], -popup > menuitem[_moz-menuactive="true"] { - background: -moz-MenuHover; - color: -moz-MenuHoverText; -} - -/* ::::: menu/menuitems in menulist popups ::::: */ - -.menulist-menupopup > menuitem, -menulist > menupopup > menuitem, -.menulist-menupopup > menu, -menulist > menupopup > menu { - border: 1px solid transparent; - -moz-padding-end: 30px; - -moz-padding-start: 5px; - padding-top: 0; - padding-bottom: 0; - 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; -} - -menulist > menupopup > menuitem > .menu-iconic-text { - margin: 0 !important; -} - -/* ::::: menuseparator ::::: */ - -menuseparator { - margin: 1px 0 1px 0 !important; - border-top: 1px solid ThreeDShadow; - border-bottom: 1px solid ThreeDHighlight; -} - -menulist > menupopup > menuseparator, -.menulist-menupopup > menuseparator { - margin: 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; -} - +/* ***** 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) + * Peter Weilbacher (mozilla@Weilbacher.org) + * + * 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-appearance: menuitem; + -moz-box-align: center; + color: MenuText; + background-color: Menu; + font: menu; + list-style-image: none; + -moz-image-region: auto; +} + +menuitem[type="checkbox"] { + -moz-appearance: checkmenuitem; +} + +menuitem[type="radio"] { + -moz-appearance: radiomenuitem; +} + +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; +} + +menuitem.spell-suggestion { + font-weight:bold; +} + +/* ..... internal content .... */ + +.menu-accel, +.menu-iconic-accel, +.menu-text, +.menu-iconic-text { + margin-top: 0 !important; + margin-bottom: 0 !important; + -moz-margin-start: 0px !important; + -moz-margin-end: 0px !important; + color: inherit; +} + +.menu-text { + -moz-margin-start: 17px !important; + 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; + -moz-margin-start: 8px !important; + color: inherit; +} + +.menu-iconic-text { + -moz-margin-start: 2px !important; +} + +.menu-iconic-left { + padding: 1px; + min-width: 15px; + min-height: 15px; +} + +/* ..... menu arrow box ..... */ + +.menu-right { + margin-top: 2px; + margin-bottom: 3px; + -moz-padding-end: 6px; + list-style-image: none; + -moz-image-region: auto; +} + +/* ::::: menu/menuitems in menubar ::::: */ + +menubar > menu { + border: 1px solid transparent; + -moz-margin-start: 2px; + -moz-margin-end: 3px; + margin-top: 1px; + margin-bottom: 0; +} + +menubar > menu[_moz-menuactive="true"][open="true"] { + border: 1px solid transparent; + -moz-margin-start: 2px; + -moz-margin-end: 3px; + margin-top: 1px; + margin-bottom: 0; + color: -moz-MenuBarHoverText; + background-color: -moz-MenuHover; +} + +/* ..... internal content .... */ + +.menubar-left { + color: inherit; +} + +.menubar-text { + color: inherit; +} + +/* menu[_moz-menuactive="true"][open="true"] > .menubar-text { + -moz-margin-start: 2 !important; + -moz-margin-end: 2 !important; */ + /* border: 0 5px 0 3px solid -moz-MenuHover !important; */ + /* padding: 0 2px 0 3px !important; */ +/* } */ + +/* ::::: menu/menuitems in popups ::::: */ + +menupopup > menu, +popup > menu, +menupopup > menuitem, +popup > menuitem { + max-width: 42em; +} + +menupopup > menu[_moz-menuactive="true"], +menupopup > menuitem[_moz-menuactive="true"], +popup > menu[_moz-menuactive="true"], +popup > menuitem[_moz-menuactive="true"] { + background: -moz-MenuHover; + color: -moz-MenuHoverText; +} + +/* ::::: menu/menuitems in menulist popups ::::: */ + +.menulist-menupopup > menuitem, +menulist > menupopup > menuitem, +.menulist-menupopup > menu, +menulist > menupopup > menu { + border: 1px solid transparent; + -moz-padding-end: 30px; + -moz-padding-start: 5px; + padding-top: 0; + padding-bottom: 0; + 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; +} + +menulist > menupopup > menuitem > .menu-iconic-text { + margin: 0 !important; +} + +/* ::::: menuseparator ::::: */ + +menuseparator { + margin: 1px 0 1px 0 !important; + border-top: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDHighlight; +} + +menulist > menupopup > menuseparator, +.menulist-menupopup > menuseparator { + margin: 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; +} + diff --git a/mozilla/toolkit/themes/pmstripe/global/popup.css b/mozilla/toolkit/themes/pmstripe/global/popup.css index 9723c32e014..e5604acaf87 100755 --- a/mozilla/toolkit/themes/pmstripe/global/popup.css +++ b/mozilla/toolkit/themes/pmstripe/global/popup.css @@ -1,117 +1,117 @@ -/* ***** 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) - * Peter Weilbacher (mozilla@Weilbacher.org) - * - * 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 ***** */ - -/* ===== popup.css =================================================== - == Styles used by the XUL popup element. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: menupopup ::::: */ - -menupopup { - -moz-appearance: menupopup; - border: 2px solid; - border-top: 1px solid; - -moz-border-top-colors: ThreeDHighlight; - -moz-border-left-colors: grey ThreeDHighlight; - -moz-border-right-colors: black ThreeDShadow; - -moz-border-bottom-colors: black ThreeDShadow; - padding: 1px; - background-color: Menu; - min-width: 1px; -} -popup { - -moz-appearance: menupopup; - border: 2px solid; - -moz-border-top-colors: grey ThreeDHighlight; - -moz-border-left-colors: grey ThreeDHighlight; - -moz-border-right-colors: black ThreeDShadow; - -moz-border-bottom-colors: black ThreeDShadow; - padding: 1px; - background-color: Menu; - min-width: 1px; -} - -menupopup > menu > menupopup, -popup > menu > menupopup { - /* align submenus */ - -moz-margin-start: -3px; - margin-top: -3px; -} - -/* ::::: tooltip ::::: */ - -tooltip { - -moz-appearance: tooltip; - margin-top: 21px; - border: 1px solid InfoText; - padding: 2px 3px; - max-width: 40em; - background-color: InfoBackground; - color: InfoText; - font: message-box; -} - -.tooltip-label { - margin: 0px !important; -} - -tooltip[titletip="true"] { - /* See bug 32157 comment 128 - * margin: -2px 0px 0px -3px; - */ - max-width: none; -} - -/* rules for popups associated with menulists */ - -menulist > menupopup, -.menulist-menupopup { - -moz-appearance: none; - border-width: 1px; - -moz-border-top-colors: -moz-FieldText; - -moz-border-right-colors: -moz-FieldText; - -moz-border-bottom-colors: -moz-FieldText; - -moz-border-left-colors: -moz-FieldText; - padding: 0px; - min-width: 0px; - background-color: -moz-Field; -} - +/* ***** 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) + * Peter Weilbacher (mozilla@Weilbacher.org) + * + * 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 ***** */ + +/* ===== popup.css =================================================== + == Styles used by the XUL popup element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: menupopup ::::: */ + +menupopup { + -moz-appearance: menupopup; + border: 2px solid; + border-top: 1px solid; + -moz-border-top-colors: ThreeDHighlight; + -moz-border-left-colors: grey ThreeDHighlight; + -moz-border-right-colors: black ThreeDShadow; + -moz-border-bottom-colors: black ThreeDShadow; + padding: 1px; + background-color: Menu; + min-width: 1px; +} +popup { + -moz-appearance: menupopup; + border: 2px solid; + -moz-border-top-colors: grey ThreeDHighlight; + -moz-border-left-colors: grey ThreeDHighlight; + -moz-border-right-colors: black ThreeDShadow; + -moz-border-bottom-colors: black ThreeDShadow; + padding: 1px; + background-color: Menu; + min-width: 1px; +} + +menupopup > menu > menupopup, +popup > menu > menupopup { + /* align submenus */ + -moz-margin-start: -3px; + margin-top: -3px; +} + +/* ::::: tooltip ::::: */ + +tooltip { + -moz-appearance: tooltip; + margin-top: 21px; + border: 1px solid InfoText; + padding: 2px 3px; + max-width: 40em; + background-color: InfoBackground; + color: InfoText; + font: message-box; +} + +.tooltip-label { + margin: 0px !important; +} + +tooltip[titletip="true"] { + /* See bug 32157 comment 128 + * margin: -2px 0px 0px -3px; + */ + max-width: none; +} + +/* rules for popups associated with menulists */ + +menulist > menupopup, +.menulist-menupopup { + -moz-appearance: none; + border-width: 1px; + -moz-border-top-colors: -moz-FieldText; + -moz-border-right-colors: -moz-FieldText; + -moz-border-bottom-colors: -moz-FieldText; + -moz-border-left-colors: -moz-FieldText; + padding: 0px; + min-width: 0px; + background-color: -moz-Field; +} + diff --git a/mozilla/toolkit/themes/pmstripe/global/toolbar.css b/mozilla/toolkit/themes/pmstripe/global/toolbar.css index 7ad29f9e905..e235c8347ce 100755 --- a/mozilla/toolkit/themes/pmstripe/global/toolbar.css +++ b/mozilla/toolkit/themes/pmstripe/global/toolbar.css @@ -1,159 +1,159 @@ -/* ***** 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) - * Peter Weilbacher (mozilla@Weilbacher.org) - * - * 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 ***** */ - -/* ===== toolbar.css ==================================================== - == Styles used by XUL toolbar-related elements. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: toolbox ::::: */ - -toolbox { - -moz-appearance: toolbox; - border: none; - background-color: ThreeDFace; - color: ButtonText; -} - -/* ::::: toolbar & menubar ::::: */ - -toolbar { - -moz-appearance: toolbar; - border-top: 1px solid; - border-bottom: 1px solid; - -moz-border-top-colors: ThreeDHighlight; - -moz-border-bottom-colors: ThreeDShadow; -} - -toolbar[type="menubar"], menubar { - -moz-appearance: toolbar; - border-top: none !important; - border-bottom: 1px solid; - -moz-border-bottom-colors: ThreeDShadow; -} - -toolbar:first-child, menubar:first-child { - border-top: none /* 1px solid */ !important; - /* -moz-border-top-colors: ThreeDHighlight !important; */ -} - -toolbar[mode="icons"] .toolbarbutton-text { - display: none; -} - -toolbar[mode="text"] .toolbarbutton-icon { - display: none; -} - -toolbar[mode="text"] .toolbarbutton-text { - padding: 0 !important; - margin: 3px 5px !important; -} - -/* ::::: toolbar decorations ::::: */ - -toolbarseparator { - margin : 2px 0.2em; - border-right : 1px solid ThreeDHighlight; - border-left : 1px solid ThreeDShadow; - width : 2px; -} - -toolbarspacer { - width: 15px; -} - -/* ::::: toolbarpaletteitem ::::: */ - -toolbarpaletteitem { - cursor: -moz-grab; -} - -.toolbarpaletteitem-box[type="spacer"], -.toolbarpaletteitem-box[type="spring"] { - border: 1px solid #808080; - background-color: #FFF !important; -} - -toolbarpaletteitem[place="toolbar"] { - margin-left: -2px; - margin-right: -2px; - border-left: 2px solid transparent; - border-right: 2px solid transparent; -} - -toolbarpaletteitem[place="toolbar"] > toolbarspacer { - width: 11px; -} - -.toolbarpaletteitem-box[type="spacer"][place="toolbar"], -.toolbarpaletteitem-box[type="spring"][place="toolbar"] { - margin-top: 2px; - margin-bottom: 2px; - -moz-margin-start: 0px; - -moz-margin-end: 2px; -} - -.toolbarpaletteitem-box[type="separator"][place="palette"] { - width: 2px; - height: 50px; -} - -.toolbarpaletteitem-box[type="spacer"][place="palette"], -.toolbarpaletteitem-box[type="spring"][place="palette"] { - margin-bottom: 2px; - width: 50px; - height: 50px; -} - -.toolbarpaletteitem-box[type="spring"][place="palette"] { - background: url("chrome://global/skin/toolbar/spring.gif") no-repeat center; -} - -/* ..... drag and drop feedback ..... */ - -toolbarpaletteitem[dragover="left"] { - border-left-color: #000000; -} - -toolbarpaletteitem[dragover="right"] { - border-right-color: #000000; -} - +/* ***** 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) + * Peter Weilbacher (mozilla@Weilbacher.org) + * + * 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 ***** */ + +/* ===== toolbar.css ==================================================== + == Styles used by XUL toolbar-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: toolbox ::::: */ + +toolbox { + -moz-appearance: toolbox; + border: none; + background-color: ThreeDFace; + color: ButtonText; +} + +/* ::::: toolbar & menubar ::::: */ + +toolbar { + -moz-appearance: toolbar; + border-top: 1px solid; + border-bottom: 1px solid; + -moz-border-top-colors: ThreeDHighlight; + -moz-border-bottom-colors: ThreeDShadow; +} + +toolbar[type="menubar"], menubar { + -moz-appearance: toolbar; + border-top: none !important; + border-bottom: 1px solid; + -moz-border-bottom-colors: ThreeDShadow; +} + +toolbar:first-child, menubar:first-child { + border-top: none /* 1px solid */ !important; + /* -moz-border-top-colors: ThreeDHighlight !important; */ +} + +toolbar[mode="icons"] .toolbarbutton-text { + display: none; +} + +toolbar[mode="text"] .toolbarbutton-icon { + display: none; +} + +toolbar[mode="text"] .toolbarbutton-text { + padding: 0 !important; + margin: 3px 5px !important; +} + +/* ::::: toolbar decorations ::::: */ + +toolbarseparator { + margin : 2px 0.2em; + border-right : 1px solid ThreeDHighlight; + border-left : 1px solid ThreeDShadow; + width : 2px; +} + +toolbarspacer { + width: 15px; +} + +/* ::::: toolbarpaletteitem ::::: */ + +toolbarpaletteitem { + cursor: -moz-grab; +} + +.toolbarpaletteitem-box[type="spacer"], +.toolbarpaletteitem-box[type="spring"] { + border: 1px solid #808080; + background-color: #FFF !important; +} + +toolbarpaletteitem[place="toolbar"] { + margin-left: -2px; + margin-right: -2px; + border-left: 2px solid transparent; + border-right: 2px solid transparent; +} + +toolbarpaletteitem[place="toolbar"] > toolbarspacer { + width: 11px; +} + +.toolbarpaletteitem-box[type="spacer"][place="toolbar"], +.toolbarpaletteitem-box[type="spring"][place="toolbar"] { + margin-top: 2px; + margin-bottom: 2px; + -moz-margin-start: 0px; + -moz-margin-end: 2px; +} + +.toolbarpaletteitem-box[type="separator"][place="palette"] { + width: 2px; + height: 50px; +} + +.toolbarpaletteitem-box[type="spacer"][place="palette"], +.toolbarpaletteitem-box[type="spring"][place="palette"] { + margin-bottom: 2px; + width: 50px; + height: 50px; +} + +.toolbarpaletteitem-box[type="spring"][place="palette"] { + background: url("chrome://global/skin/toolbar/spring.gif") no-repeat center; +} + +/* ..... drag and drop feedback ..... */ + +toolbarpaletteitem[dragover="left"] { + border-left-color: #000000; +} + +toolbarpaletteitem[dragover="right"] { + border-right-color: #000000; +} +