From e3bb7f885ed4b2f786f8ee7c229182c5cc05d1be Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Sat, 16 Sep 2006 20:20:28 +0000 Subject: [PATCH] Classic theme icon refresh b=348720 p=MReimer r+sr=me --- extensions/help/resources/jar.mn | 1 - .../help/resources/skin/classic/help.css | 117 ------- themes/classic/communicator/brand.css | 75 ----- themes/classic/communicator/button.css | 134 -------- .../communicator/icons/communicatoricons.png | 0 .../icons/{btn1.gif => search.png} | 0 .../classic/editor/editorPrimaryToolbar.css | 318 ------------------ .../icons/editoricons.png} | 0 themes/classic/jar.mn | 19 +- .../messenger/addressbook/addressbook.css | 251 -------------- .../addressbook/icons/addressbookicons.png} | 0 .../messenger/addressbook/icons/im-dis.gif | 0 .../messenger/addressbook/icons/im-hov.gif | 0 .../messenger/addressbook/icons/im.gif | 0 themes/classic/messenger/icons/btn1.gif | 0 .../icons/messengericons.png} | 0 .../messengercompose/messengercompose.css | 45 +-- themes/classic/messenger/primaryToolbar.css | 105 +++--- .../classic/messenger/smime/icons/smbtn1.gif | 0 .../smime/icons/smimeicons.png} | 0 .../messenger/smime/msgCompSMIMEOverlay.css | 92 ----- themes/classic/navigator/icons/btn1.gif | 0 .../icons/navigatoricons.png} | 0 themes/classic/navigator/navigator.css | 58 ++-- 24 files changed, 115 insertions(+), 1100 deletions(-) rename extensions/help/resources/skin/classic/home.gif => themes/classic/communicator/icons/communicatoricons.png (100%) rename themes/classic/communicator/icons/{btn1.gif => search.png} (100%) rename themes/classic/{communicator/icons/search-act.gif => editor/icons/editoricons.png} (100%) rename themes/classic/{communicator/icons/search-hov.gif => messenger/addressbook/icons/addressbookicons.png} (100%) delete mode 100644 themes/classic/messenger/addressbook/icons/im-dis.gif delete mode 100644 themes/classic/messenger/addressbook/icons/im-hov.gif delete mode 100644 themes/classic/messenger/addressbook/icons/im.gif delete mode 100644 themes/classic/messenger/icons/btn1.gif rename themes/classic/{communicator/icons/search.gif => messenger/icons/messengericons.png} (100%) delete mode 100644 themes/classic/messenger/smime/icons/smbtn1.gif rename themes/classic/{editor/icons/btn1.gif => messenger/smime/icons/smimeicons.png} (100%) delete mode 100644 themes/classic/navigator/icons/btn1.gif rename themes/classic/{messenger/addressbook/icons/im-act.gif => navigator/icons/navigatoricons.png} (100%) diff --git a/extensions/help/resources/jar.mn b/extensions/help/resources/jar.mn index d349e680c0e..b3f038701eb 100644 --- a/extensions/help/resources/jar.mn +++ b/extensions/help/resources/jar.mn @@ -126,6 +126,5 @@ modern.jar: classic.jar: skin/classic/communicator/help.css (skin/classic/help.css) - skin/classic/communicator/home.gif (skin/classic/home.gif) diff --git a/extensions/help/resources/skin/classic/help.css b/extensions/help/resources/skin/classic/help.css index 25f7c353802..e69de29bb2d 100644 --- a/extensions/help/resources/skin/classic/help.css +++ b/extensions/help/resources/skin/classic/help.css @@ -1,117 +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-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 ***** */ - -@import url("chrome://communicator/skin/sidebar/sidebar.css"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: primary toolbar buttons ::::: */ - -.toolbarbutton-1 { - list-style-image: url("chrome://navigator/skin/icons/btn1.gif"); -} - -#helpBackButton { - -moz-image-region: rect(0px 19px 20px 0px); -} - -#helpBackButton:hover { - -moz-image-region: rect(0px 38px 20px 19px); -} - -#helpBackButton:hover:active { - -moz-image-region: rect(0px 57px 20px 38px); -} - -#helpBackButton[disabled="true"] { - -moz-image-region: rect(0px 76px 20px 57px) !important; -} - -#helpForwardButton { - -moz-image-region: rect(20px 19px 40px 0px); -} - -#helpForwardButton:hover { - -moz-image-region: rect(20px 38px 40px 19px); -} - -#helpForwardButton:hover:active { - -moz-image-region: rect(20px 57px 40px 38px); -} - -#helpForwardButton[disabled="true"] { - -moz-image-region: rect(20px 76px 40px 57px) !important; -} - -#helpPrintButton { - list-style-image: url("chrome://communicator/skin/icons/btn1.gif"); - -moz-image-region: rect(0px 23px 21px 0px); -} - -#helpPrintButton:hover { - -moz-image-region: rect(0px 46px 21px 23px); -} - -#helpPrintButton:hover:active { - -moz-image-region: rect(0px 69px 21px 46px); -} - -#helpPrintButton[disabled="true"] { - -moz-image-region: rect(0px 92px 21px 69px) !important; -} - -#helpHomeButton { - list-style-image: url("chrome://communicator/skin/home.gif"); - -moz-image-region: rect(0px 23px 20px 0px); -} - -#helpHomeButton:hover { - -moz-image-region: rect(0px 46px 20px 23px); -} - -#helpHomeButton:hover:active { - -moz-image-region: rect(0px 69px 20px 46px); -} - -#helpsidebar-box { - min-width: 18em; -} - -/* Mac-only */ -#statusbarDummy { - min-height: 15px !important; -} diff --git a/themes/classic/communicator/brand.css b/themes/classic/communicator/brand.css index b38859f9b5e..e69de29bb2d 100644 --- a/themes/classic/communicator/brand.css +++ b/themes/classic/communicator/brand.css @@ -1,75 +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): - * - * 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 ***** */ - -/* ==== brand.css =========================================================== - == Styles related to branding in the Communicator suite. - ========================================================================== */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -#navigator-throbber { - -moz-binding: url("chrome://global/content/bindings/button.xml#button-image"); - -moz-user-focus: ignore; - -moz-box-align: center; - -moz-box-pack: center; - margin: 1px 5px 1px 10px; - border: none; - padding: 1px; - min-width: 0; - list-style-image: url("chrome://communicator/skin/brand/throbber-single.gif"); - background-color: transparent; - -moz-appearance:none !important; -} - -#navigator-throbber[busy="true"] { - list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif"); -} - -window[chromehidden~="toolbar"] #navigator-throbber, -#navigator-throbber[buttonstyle="text"], -#navigator-throbber[buttonstyle="pictures"], -#navigator-throbber[toolbarmode="small"] { - margin: 0 5px; - list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif"); -} - -window[chromehidden~="toolbar"] #navigator-throbber[busy="true"], -#navigator-throbber[buttonstyle="text"][busy="true"], -#navigator-throbber[buttonstyle="pictures"][busy="true"], -#navigator-throbber[toolbarmode="small"][busy="true"] { - list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif"); -} diff --git a/themes/classic/communicator/button.css b/themes/classic/communicator/button.css index 687e7fcee0d..e69de29bb2d 100644 --- a/themes/classic/communicator/button.css +++ b/themes/classic/communicator/button.css @@ -1,134 +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): - * - * 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 for special buttons in the Communicator suite. - ========================================================================== */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: large toolbar buttons ::::: */ - -.toolbarbutton-1, -.toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 47px; - -moz-box-orient: vertical; -} - -.toolbarbutton-1[type="menu-button"] { - -moz-box-orient: horizontal; -} - -.toolbarbutton-1, -.toolbarbutton-1 > .toolbarbutton-menubutton-button, -.toolbarbutton-1[disabled="true"]:hover:active, -.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button { - padding: 2px 7px 2px 6px; -} - -.toolbarbutton-1:hover:active, -.toolbarbutton-1[open="true"], -.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button { - padding: 3px 6px 1px 7px; -} - -.toolbarbutton-1[type="menu-button"], -.toolbarbutton-1[type="menu-button"]:hover:active, -.toolbarbutton-1[type="menu-button"][open="true"] { - padding: 0; -} - -.toolbarbutton-1[type="menu"] { - -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical"); -} - -.toolbarbutton-1[buttonstyle="pictures"], -.toolbarbutton-menubutton-button[buttonstyle="pictures"] { - min-width: 0px; -} - -.toolbarbutton-text[buttonstyle="pictures"], -.toolbarbutton-icon[buttonstyle="text"] { - display: none; -} - -/* ::::: standard toolbar buttons ::::: */ - -.button-toolbar { - -moz-user-focus: ignore; - border: 2px solid; - -moz-border-radius: 0; - min-width: 0; - background-color: transparent; -} - -.button-toolbar > .button-box { - margin: 0; - padding: 1px 2px; -} - -.button-toolbar:hover:active > .button-box { - padding: 2px 1px 0px 3px; -} - -.button-toolbar > .button-box > .button-icon, -.button-toolbar > .button-box > .button-text { - margin-right: 2px; -} - -.button-toolbar, -.button-toolbar[disabled="true"]:hover, -.button-toolbar[disabled="true"]:hover:active { - -moz-border-top-colors: transparent ThreeDHighlight; - -moz-border-right-colors: transparent ThreeDShadow; - -moz-border-bottom-colors: transparent ThreeDShadow; - -moz-border-left-colors: transparent ThreeDHighlight; -} - -.button-toolbar:hover { - -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight; -} - -.button-toolbar:hover:active { - -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight; - -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow; -} diff --git a/extensions/help/resources/skin/classic/home.gif b/themes/classic/communicator/icons/communicatoricons.png similarity index 100% rename from extensions/help/resources/skin/classic/home.gif rename to themes/classic/communicator/icons/communicatoricons.png diff --git a/themes/classic/communicator/icons/btn1.gif b/themes/classic/communicator/icons/search.png similarity index 100% rename from themes/classic/communicator/icons/btn1.gif rename to themes/classic/communicator/icons/search.png diff --git a/themes/classic/editor/editorPrimaryToolbar.css b/themes/classic/editor/editorPrimaryToolbar.css index 5b5e4fcaf68..e69de29bb2d 100644 --- a/themes/classic/editor/editorPrimaryToolbar.css +++ b/themes/classic/editor/editorPrimaryToolbar.css @@ -1,318 +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) - * Patrick Thompson (sailfish@unforgettable.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 ***** */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: primary toolbar buttons ::::: */ - -.toolbarbutton-1 { - list-style-image: url("chrome://editor/skin/icons/btn1.gif"); -} - -#newButton { - -moz-image-region: rect(0 16px 16px 0); -} - -#newButton:hover { - -moz-image-region: rect(0 32px 16px 16px); -} - -#newButton:hover:active { - -moz-image-region: rect(0 48px 16px 32px); -} - -#newButton[disabled="true"] { - -moz-image-region: rect(0 64px 16px 48px) !important; -} - -#openButton { - -moz-image-region: rect(48px 16px 64px 0); -} - -#openButton:hover { - -moz-image-region: rect(48px 32px 64px 16px); -} - -#openButton:hover:active { - -moz-image-region: rect(48px 48px 64px 32px); -} - -#openButton[disabled="true"] { - -moz-image-region: rect(148px 64px 64px 48px) !important; -} - -#saveButton { - -moz-image-region: rect(80px 16px 96px 0); -} - -#saveButton:hover { - -moz-image-region: rect(80px 32px 96px 16px); -} - -#saveButton:hover:active { - -moz-image-region: rect(80px 48px 96px 32px); -} - -#saveButton[disabled="true"] { - -moz-image-region: rect(80px 64px 96px 48px) !important; -} - -#publishButton { - -moz-image-region: rect(176px 16px 192px 0); -} - -#publishButton:hover { - -moz-image-region: rect(176px 32px 192px 16px); -} - -#publishButton:hover:active { - -moz-image-region: rect(176px 48px 192px 32px); -} - -#publishButton[disabled="true"] { - -moz-image-region: rect(176px 64px 192px 48px) !important; -} - -#previewButton { - -moz-image-region: rect(64px 16px 80px 0); -} - -#previewButton:hover { - -moz-image-region: rect(64px 32px 80px 16px); -} - -#previewButton:hover:active { - -moz-image-region: rect(64px 48px 80px 32px); -} - -#previewButton[disabled="true"] { - -moz-image-region: rect(64px 64px 80px 48px) !important; -} - -#printButton { - -moz-image-region: rect(160px 16px 176px 0); -} - -#printButton:hover { - -moz-image-region: rect(160px 32px 176px 16px); -} - -#printButton:hover:active { - -moz-image-region: rect(160px 48px 176px 32px); -} - -#printButton[disabled="true"] { - -moz-image-region: rect(160px 64px 176px 48px) !important; -} - -#linkButton { - -moz-image-region: rect(16px 16px 32px 0); -} - -#linkButton:hover { - -moz-image-region: rect(16px 32px 32px 16px); -} - -#linkButton:hover:active { - -moz-image-region: rect(16px 48px 32px 32px); -} - -#linkButton[disabled="true"] { - -moz-image-region: rect(16px 64px 32px 48px) !important; -} - -#imageButton { - -moz-image-region: rect(144px 16px 160px 0); -} - -#imageButton:hover { - -moz-image-region: rect(144px 32px 160px 16px); -} - -#imageButton:hover:active { - -moz-image-region: rect(144px 48px 160px 32px); -} - -#imageButton[disabled="true"] { - -moz-image-region: rect(144px 64px 160px 48px) !important; -} - -#namedAnchorButton { - -moz-image-region: rect(128px 16px 144px 0); -} - -#namedAnchorButton:hover { - -moz-image-region: rect(128px 32px 144px 16px); -} - -#namedAnchorButton:hover:active { - -moz-image-region: rect(128px 48px 144px 32px); -} - -#namedAnchorButton[disabled="true"] { - -moz-image-region: rect(128px 64px 144px 48px) !important; -} - -#hlineButton { - -moz-image-region: rect(32px 16px 48px 0); -} - -#hlineButton:hover { - -moz-image-region: rect(32px 32px 48px 16px); -} - -#hlineButton:hover:active { - -moz-image-region: rect(32px 48px 48px 32px); -} - -#hlineButton[disabled="true"] { - -moz-image-region: rect(32px 64px 48px 48px) !important; -} - -#tableButton { - -moz-image-region: rect(112px 16px 128px 0); -} - -#tableButton:hover { - -moz-image-region: rect(112px 32px 128px 16px); -} - -#tableButton:hover:active { - -moz-image-region: rect(112px 48px 128px 32px); -} - -#tableButton[disabled="true"] { - -moz-image-region: rect(112px 64px 128px 48px) !important; -} - -#spellingButton { - -moz-image-region: rect(96px 16px 112px 0); -} - -#spellingButton:hover { - -moz-image-region: rect(96px 32px 112px 16px); -} - -#spellingButton:hover:active { - -moz-image-region: rect(96px 48px 112px 32px); -} - -#spellingButton[disabled="true"] { - -moz-image-region: rect(96px 64px 112px 48px) !important; -} - -#cutButton { - -moz-image-region: rect(192px 16px 208px 0); -} - -#cutButton:hover { - -moz-image-region: rect(192px 32px 208px 16px); -} - -#cutButton:hover:active { - -moz-image-region: rect(192px 48px 208px 32px); -} - -#cutButton[disabled="true"] { - -moz-image-region: rect(192px 64px 208px 48px) !important; -} - -#copyButton { - -moz-image-region: rect(208px 16px 224px 0); -} - -#copyButton:hover { - -moz-image-region: rect(208px 32px 224px 16px); -} - -#copyButton:hover:active { - -moz-image-region: rect(208px 48px 224px 32px); -} - -#copyButton[disabled="true"] { - -moz-image-region: rect(208px 64px 224px 48px) !important; -} - -#pasteButton { - -moz-image-region: rect(224px 16px 240px 0); -} - -#pasteButton:hover { - -moz-image-region: rect(224px 32px 240px 16px); -} - -#pasteButton:hover:active { - -moz-image-region: rect(224px 48px 240px 32px); -} - -#pasteButton[disabled="true"] { - -moz-image-region: rect(224px 64px 240px 48px) !important; -} - -#findButton { - -moz-image-region: rect(240px 16px 256px 0); -} - -#findButton:hover { - -moz-image-region: rect(240px 32px 256px 16px); -} - -#findButton:hover:active { - -moz-image-region: rect(240px 48px 256px 32px); -} - -#findButton[disabled="true"] { - -moz-image-region: rect(240px 64px 256px 48px) !important; -} - -#formButton { - -moz-image-region: rect(256px 16px 272px 0); -} - -#formButton:hover { - -moz-image-region: rect(256px 32px 272px 16px); -} - -#formButton:hover:active { - -moz-image-region: rect(256px 48px 272px 32px); -} - -#formButton[disabled="true"] { - -moz-image-region: rect(256px 64px 272px 48px) !important; -} diff --git a/themes/classic/communicator/icons/search-act.gif b/themes/classic/editor/icons/editoricons.png similarity index 100% rename from themes/classic/communicator/icons/search-act.gif rename to themes/classic/editor/icons/editoricons.png diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn index ba266d954ac..c12f7990add 100644 --- a/themes/classic/jar.mn +++ b/themes/classic/jar.mn @@ -77,15 +77,13 @@ classic.jar: skin/classic/communicator/icons/autoscroll-ew.gif (communicator/icons/autoscroll-ew.gif) skin/classic/communicator/icons/offline.gif (communicator/icons/offline.gif) skin/classic/communicator/icons/online.gif (communicator/icons/online.gif) - skin/classic/communicator/icons/search-act.gif (communicator/icons/search-act.gif) - skin/classic/communicator/icons/search.gif (communicator/icons/search.gif) - skin/classic/communicator/icons/search-hov.gif (communicator/icons/search-hov.gif) + skin/classic/communicator/icons/search.png (communicator/icons/search.png) skin/classic/communicator/icons/lock-secure.gif (communicator/icons/lock-secure.gif) skin/classic/communicator/icons/lock-broken.gif (communicator/icons/lock-broken.gif) skin/classic/communicator/icons/lock-insecure.gif (communicator/icons/lock-insecure.gif) skin/classic/communicator/icons/loading.gif (communicator/icons/loading.gif) skin/classic/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif) - skin/classic/communicator/icons/btn1.gif (communicator/icons/btn1.gif) + skin/classic/communicator/icons/communicatoricons.png (communicator/icons/communicatoricons.png) skin/classic/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif) skin/classic/communicator/icons/smileys/frown_n.gif (communicator/icons/smileys/frown_n.gif) skin/classic/communicator/icons/smileys/wink_n.gif (communicator/icons/smileys/wink_n.gif) @@ -134,7 +132,7 @@ classic.jar: skin/classic/editor/icons/img-align-middle.gif (editor/icons/img-align-middle.gif) skin/classic/editor/icons/img-align-right.gif (editor/icons/img-align-right.gif) skin/classic/editor/icons/img-align-top.gif (editor/icons/img-align-top.gif) - skin/classic/editor/icons/btn1.gif (editor/icons/btn1.gif) + skin/classic/editor/icons/editoricons.png (editor/icons/editoricons.png) skin/classic/editor/icons/btn2.gif (editor/icons/btn2.gif) skin/classic/editor/icons/progress-busy.gif (editor/icons/progress-busy.gif) skin/classic/editor/icons/progress-done.gif (editor/icons/progress-done.gif) @@ -494,7 +492,7 @@ classic.jar: skin/classic/messenger/icons/readmail.gif (messenger/icons/readmail.gif) skin/classic/messenger/icons/unreadmail.gif (messenger/icons/unreadmail.gif) skin/classic/messenger/icons/unthreadcol.gif (messenger/icons/unthreadcol.gif) - skin/classic/messenger/icons/btn1.gif (messenger/icons/btn1.gif) + skin/classic/messenger/icons/messengericons.png (messenger/icons/messengericons.png) skin/classic/messenger/icons/junkBar.gif (messenger/icons/junkBar.gif) skin/classic/messenger/icons/thread-closed-eye.gif (messenger/icons/thread-closed-eye.gif) skin/classic/messenger/icons/thread-closed-kill.gif (messenger/icons/thread-closed-kill.gif) @@ -523,16 +521,13 @@ classic.jar: skin/classic/messenger/addressbook/selectAddressesDialog.css (messenger/addressbook/selectAddressesDialog.css) skin/classic/messenger/addressbook/sidebarPanel.css (messenger/addressbook/sidebarPanel.css) skin/classic/messenger/addressbook/addressbook.css (messenger/addressbook/addressbook.css) + skin/classic/messenger/addressbook/icons/addressbookicons.png (messenger/addressbook/icons/addressbookicons.png) skin/classic/messenger/addressbook/icons/addrbook.gif (messenger/addressbook/icons/addrbook.gif) skin/classic/messenger/addressbook/icons/ablist.gif (messenger/addressbook/icons/ablist.gif) skin/classic/messenger/addressbook/icons/remote-addrbook.gif (messenger/addressbook/icons/remote-addrbook.gif) skin/classic/messenger/addressbook/icons/secure-remote-addrbook.gif (messenger/addressbook/icons/secure-remote-addrbook.gif) skin/classic/messenger/addressbook/icons/remote-addrbook-error.gif (messenger/addressbook/icons/remote-addrbook-error.gif) skin/classic/messenger/addressbook/icons/abcard.gif (messenger/addressbook/icons/abcard.gif) - skin/classic/messenger/addressbook/icons/im.gif (messenger/addressbook/icons/im.gif) - skin/classic/messenger/addressbook/icons/im-act.gif (messenger/addressbook/icons/im-act.gif) - skin/classic/messenger/addressbook/icons/im-hov.gif (messenger/addressbook/icons/im-hov.gif) - skin/classic/messenger/addressbook/icons/im-dis.gif (messenger/addressbook/icons/im-dis.gif) skin/classic/messenger/messengercompose/messengercompose.css (messenger/messengercompose/messengercompose.css) skin/classic/messenger/smime/msgReadSecurityInfo.css (messenger/smime/msgReadSecurityInfo.css) skin/classic/messenger/smime/msgCompSecurityInfo.css (messenger/smime/msgCompSecurityInfo.css) @@ -540,7 +535,7 @@ classic.jar: skin/classic/messenger/smime/msgCompSMIMEOverlay.css (messenger/smime/msgCompSMIMEOverlay.css) skin/classic/messenger/smime/certFetchingStatus.css (messenger/smime/certFetchingStatus.css) skin/classic/messenger/smime/msgHdrViewSMIMEOverlay.css (messenger/smime/msgHdrViewSMIMEOverlay.css) - skin/classic/messenger/smime/icons/smbtn1.gif (messenger/smime/icons/smbtn1.gif) + skin/classic/messenger/smime/icons/smimeicons.png (messenger/smime/icons/smimeicons.png) skin/classic/messenger/smime/icons/sbSignOk.gif (messenger/smime/icons/sbSignOk.gif) skin/classic/messenger/smime/icons/sbSignUnknown.gif (messenger/smime/icons/sbSignUnknown.gif) skin/classic/messenger/smime/icons/sbSignNotOk.gif (messenger/smime/icons/sbSignNotOk.gif) @@ -572,7 +567,7 @@ classic.jar: skin/classic/navigator/btn1/up.gif (navigator/btn1/up.gif) skin/classic/navigator/btn1/up-disabled.gif (navigator/btn1/up-disabled.gif) skin/classic/navigator/btn1/up-hover.gif (navigator/btn1/up-hover.gif) - skin/classic/navigator/icons/btn1.gif (navigator/icons/btn1.gif) + skin/classic/navigator/icons/navigatoricons.png (navigator/icons/navigatoricons.png) skin/classic/navigator/icons/minimize.gif (navigator/icons/minimize.gif) skin/classic/navigator/icons/restore.gif (navigator/icons/restore.gif) skin/classic/navigator/icons/close.gif (navigator/icons/close.gif) diff --git a/themes/classic/messenger/addressbook/addressbook.css b/themes/classic/messenger/addressbook/addressbook.css index f38acb829fe..e69de29bb2d 100644 --- a/themes/classic/messenger/addressbook/addressbook.css +++ b/themes/classic/messenger/addressbook/addressbook.css @@ -1,251 +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) - * - * 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 ***** */ - -/* ===== addressbook.css ================================================ - == Styles for the main Address Book window. - ======================================================================= */ - -@import url("chrome://messenger/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -/* ::::: primary toolbar buttons ::::: */ - -.toolbarbutton-1 { - list-style-image: url("chrome://messenger/skin/icons/btn1.gif"); -} - -#button-newcard { - -moz-image-region: rect(0px 23px 21px 0px); -} - -#button-newcard:hover { - -moz-image-region: rect(0px 46px 21px 23px); -} - -#button-newcard:hover:active { - -moz-image-region: rect(0px 69px 21px 46px); -} - -#button-newcard[disabled] { - -moz-image-region: rect(0px 92px 21px 69px) !important; -} - -#button-newlist { - -moz-image-region: rect(21px 46px 42px 23px); -} - -#button-newlist:hover { - -moz-image-region: rect(21px 23px 42px 0px); -} - -#button-newlist:hover:active { - -moz-image-region: rect(21px 69px 42px 46px); -} - -#button-newlist[disabled] { - -moz-image-region: rect(21px 92px 42px 69px) !important; -} - -#button-editcard { - -moz-image-region: rect(42px 23px 63px 0px); -} - -#button-editcard:hover { - -moz-image-region: rect(42px 46px 63px 23px); -} - -#button-editcard:hover:active { - -moz-image-region: rect(42px 69px 63px 46px); -} - -#button-editcard[disabled] { - -moz-image-region: rect(42px 92px 63px 69px) !important; -} - -#button-newmessage { - -moz-image-region: rect(126px 23px 147px 0px); -} - -#button-newmessage:hover { - -moz-image-region: rect(126px 46px 147px 23px); -} - -#button-newmessage:hover:active { - -moz-image-region: rect(126px 69px 147px 46px); -} - -#button-newmessage[disabled] { - -moz-image-region: rect(126px 92px 147px 69px) !important; -} - -#button-newim { - list-style-image: url("chrome://messenger/skin/addressbook/icons/im.gif"); -} - -#button-newim:hover { - list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hov.gif"); -} - -button-newim:hover:active { - list-style-image: url("chrome://messenger/skin/addressbook/icons/im-act.gif"); -} - -#button-newim[disabled] { - list-style-image: url("chrome://messenger/skin/addressbook/icons/im-dis.gif"); -} - -#button-delete { - -moz-image-region: rect(210px 23px 231px 0px); -} - -#button-delete:hover { - -moz-image-region: rect(210px 46px 231px 23px); -} - -#button-delete:hover:active { - -moz-image-region: rect(210px 69px 231px 46px); -} - -#button-delete[disabled] { - -moz-image-region: rect(210px 92px 231px 69px) !important; -} - -/* CardView styles - used in the Card View Pane */ - -#CardViewOuterBox { - border-left: 1px solid ThreeDShadow; - border-top: 1px solid ThreeDShadow; - border-right: 1px solid ThreeDHighlight; -} - -#CardViewBox { - -moz-user-focus: ignore; - overflow: auto; - min-width: 150px; - border-left: 1px solid ThreeDDarkShadow; - border-top: 1px solid ThreeDDarkShadow; - border-bottom: 1px solid ThreeDLightShadow; - border-right: 1px solid ThreeDLightShadow; - background-color: #FFFFFF; -} - -#CardViewInnerBox { - margin-top: 2px; - margin-bottom: 2px; - padding-left: 8px; - padding-right: 8px; -} - -#CardTitle { - font-size: 150%; - font-weight: bold; - border-bottom: 2px solid black; - min-width: 120px; - margin: 0px; -} - -.cardViewGroup { - margin-top: 8px; - padding-bottom: 5px; - min-width: 50px; -} - -.CardViewHeading { - padding: 1px; - padding-left: 5px; - margin: 0px 0px 1px 0px; - background-color: #CCCCFF; - color: black; - font-weight: bold; - min-width: 30px; -} - -#cvBuddyIcon { - padding-left: 20px; - padding-top: 2px; -} - -.CardViewText, -.CardViewLink { - padding-left: 20px; - padding-right: 2px; - min-width: 30px; - margin: 0px; -} - -.CardViewLink { - color: blue; - text-decoration: underline; - cursor: pointer; -} - - -#cvHomeMapIt, #cvWorkMapIt { - margin-bottom: 0px; -} - -html|a { - padding-left: 0px; - padding-right: 2px; - border: none !important; -} - -html|p { - border: none !important; -} - -/* ::::: border adjustments ::::: */ - -#dirTree, -#resultsTree { - border: none; - margin: 0px 0px 0px 0px !important; -} - -#resultsTree { - border-left: 1px solid ThreeDShadow; -} - -/* ::::: Search Bar ::::: */ - -#searchBox { - border-top: 1px solid ThreeDHighlight; - border-bottom: 1px solid ThreeDShadow; -} diff --git a/themes/classic/communicator/icons/search-hov.gif b/themes/classic/messenger/addressbook/icons/addressbookicons.png similarity index 100% rename from themes/classic/communicator/icons/search-hov.gif rename to themes/classic/messenger/addressbook/icons/addressbookicons.png diff --git a/themes/classic/messenger/addressbook/icons/im-dis.gif b/themes/classic/messenger/addressbook/icons/im-dis.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/messenger/addressbook/icons/im-hov.gif b/themes/classic/messenger/addressbook/icons/im-hov.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/messenger/addressbook/icons/im.gif b/themes/classic/messenger/addressbook/icons/im.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/messenger/icons/btn1.gif b/themes/classic/messenger/icons/btn1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/communicator/icons/search.gif b/themes/classic/messenger/icons/messengericons.png similarity index 100% rename from themes/classic/communicator/icons/search.gif rename to themes/classic/messenger/icons/messengericons.png diff --git a/themes/classic/messenger/messengercompose/messengercompose.css b/themes/classic/messenger/messengercompose/messengercompose.css index 5105deef04f..3599ee4104a 100644 --- a/themes/classic/messenger/messengercompose/messengercompose.css +++ b/themes/classic/messenger/messengercompose/messengercompose.css @@ -21,6 +21,7 @@ * * Contributor(s): * Joe Hewitt (hewitt@netscape.com) + * Manuel Reimer (Manuel.Reimer@gmx.de) * * 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"), @@ -47,87 +48,89 @@ /* ::::: primary toolbar buttons ::::: */ .toolbarbutton-1 { - list-style-image: url("chrome://messenger/skin/icons/btn1.gif"); + list-style-image: url("chrome://messenger/skin/icons/mailicons.png"); } #button-send { - -moz-image-region: rect(294px 23px 315px 0px); + -moz-image-region: rect(330px 29px 359px 0); } #button-send:hover { - -moz-image-region: rect(294px 46px 315px 23px); + -moz-image-region: rect(330px 59px 359px 30px); } #button-send:hover:active { - -moz-image-region: rect(294px 69px 315px 46px); + -moz-image-region: rect(330px 89px 359px 60px); } #button-send[disabled="true"] { - -moz-image-region: rect(294px 92px 315px 69px) !important; + -moz-image-region: rect(330px 119px 359px 90px) !important; } #button-address { - -moz-image-region: rect(231px 23px 252px 0px); + -moz-image-region: rect(270px 29px 299px 0); } #button-address:hover { - -moz-image-region: rect(231px 46px 252px 23px); + -moz-image-region: rect(270px 59px 299px 30px); } #button-address:hover:active { - -moz-image-region: rect(231px 69px 252px 46px); + -moz-image-region: rect(270px 89px 299px 60px); } #button-address[disabled="true"] { - -moz-image-region: rect(231px 92px 252px 69px) !important; + -moz-image-region: rect(270px 119px 299px 90px) !important; } #button-attach { - -moz-image-region: rect(252px 23px 273px 0px); + -moz-image-region: rect(300px 29px 329px 0); } #button-attach:hover { - -moz-image-region: rect(252px 46px 273px 23px); + -moz-image-region: rect(300px 59px 329px 30px); } #button-attach:hover:active { - -moz-image-region: rect(252px 69px 273px 46px); + -moz-image-region: rect(300px 89px 329px 60px); } #button-attach[disabled="true"] { - -moz-image-region: rect(252px 92px 273px 69px) !important; + -moz-image-region: rect(300px 119px 329px 90px) !important; } #spellingButton { - -moz-image-region: rect(378px 23px 399px 0px); + list-style-image: url("chrome://editor/skin/icons/editoricons.png"); + -moz-image-region: rect(240px 29px 269px 0); } #spellingButton:hover { - -moz-image-region: rect(378px 46px 399px 23px); + -moz-image-region: rect(240px 59px 269px 30px); } #spellingButton:hover:active { - -moz-image-region: rect(378px 69px 399px 46px); + -moz-image-region: rect(240px 89px 269px 60px); } #spellingButton[disabled="true"] { - -moz-image-region: rect(378px 92px 399px 69px) !important; + -moz-image-region: rect(240px 119px 269px 90px) !important; } #button-save { - -moz-image-region: rect(273px 23px 294px 0px); + list-style-image: url("chrome://editor/skin/icons/editoricons.png"); + -moz-image-region: rect(210px 29px 239px 0); } #button-save:hover { - -moz-image-region: rect(273px 46px 294px 23px); + -moz-image-region: rect(210px 59px 239px 30px); } #button-save:hover:active { - -moz-image-region: rect(273px 69px 294px 46px); + -moz-image-region: rect(210px 89px 239px 60px); } #button-save[disabled="true"] { - -moz-image-region: rect(273px 92px 294px 69px) !important; + -moz-image-region: rect(210px 119px 239px 90px) !important; } /* ::::: special toolbar colors ::::: */ diff --git a/themes/classic/messenger/primaryToolbar.css b/themes/classic/messenger/primaryToolbar.css index 25b3e1e5eba..d4e84946abf 100644 --- a/themes/classic/messenger/primaryToolbar.css +++ b/themes/classic/messenger/primaryToolbar.css @@ -20,6 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Manuel Reimer (Manuel.Reimer@gmx.de) * * 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"), @@ -44,202 +45,202 @@ /* ::::: primary toolbar buttons ::::: */ .toolbarbutton-1 { - list-style-image: url("chrome://messenger/skin/icons/btn1.gif"); + list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); } #button-getmsg { - -moz-image-region: rect(105px 23px 126px 0px); + -moz-image-region: rect(90px 29px 119px 0); } #button-getmsg:hover { - -moz-image-region: rect(105px 46px 126px 23px); + -moz-image-region: rect(90px 59px 119px 30px); } #button-getmsg:hover:active { - -moz-image-region: rect(105px 69px 126px 46px); + -moz-image-region: rect(90px 89px 119px 60px); } #button-getmsg[disabled] { - -moz-image-region: rect(105px 92px 126px 69px) !important; + -moz-image-region: rect(90px 119px 119px 90px) !important; } #button-newmsg { - -moz-image-region: rect(126px 23px 147px 0px); + -moz-image-region: rect(150px 29px 179px 0); } #button-newmsg:hover { - -moz-image-region: rect(126px 46px 147px 23px); + -moz-image-region: rect(150px 59px 179px 30px); } #button-newmsg:hover:active { - -moz-image-region: rect(126px 69px 147px 46px); + -moz-image-region: rect(150px 89px 179px 60px); } #button-newmsg[disabled] { - -moz-image-region: rect(126px 92px 147px 69px) !important; + -moz-image-region: rect(150px 119px 179px 90px) !important; } #button-reply { - -moz-image-region: rect(168px 23px 189px 0px); + -moz-image-region: rect(210px 29px 239px 0); } #button-reply:hover { - -moz-image-region: rect(168px 46px 189px 23px); + -moz-image-region: rect(210px 59px 239px 30px); } #button-reply:hover:active { - -moz-image-region: rect(168px 69px 189px 46px); + -moz-image-region: rect(210px 89px 239px 60px); } #button-reply[disabled] { - -moz-image-region: rect(168px 92px 189px 69px) !important; + -moz-image-region: rect(210px 119px 239px 90px) !important; } #button-replyall { - -moz-image-region: rect(189px 23px 210px 0px); + -moz-image-region: rect(240px 29px 269px 0); } #button-replyall:hover { - -moz-image-region: rect(189px 46px 210px 23px); + -moz-image-region: rect(240px 59px 269px 30px); } #button-replyall:hover:active { - -moz-image-region: rect(189px 69px 210px 46px); + -moz-image-region: rect(240px 89px 269px 60px); } #button-replyall[disabled] { - -moz-image-region: rect(189px 92px 210px 69px) !important; + -moz-image-region: rect(240px 119px 269px 90px) !important; } #button-forward { - -moz-image-region: rect(84px 23px 105px 0px); + -moz-image-region: rect(60px 29px 89px 0); } #button-forward:hover { - -moz-image-region: rect(84px 46px 105px 23px); + -moz-image-region: rect(60px 59px 89px 30px); } #button-forward:hover:active { - -moz-image-region: rect(84px 69px 105px 46px); + -moz-image-region: rect(60px 89px 89px 60px); } #button-forward[disabled] { - -moz-image-region: rect(84px 92px 105px 69px) !important; + -moz-image-region: rect(60px 119px 89px 90px) !important; } #button-file { - -moz-image-region: rect(63px 23px 84px 0px); + -moz-image-region: rect(30px 29px 59px 0); } #button-file:hover { - -moz-image-region: rect(63px 46px 84px 23px); + -moz-image-region: rect(30px 59px 59px 30px); } #button-file:hover:active, #button-file[open] { - -moz-image-region: rect(63px 69px 84px 46px); + -moz-image-region: rect(30px 89px 59px 60px); } #button-file[disabled] { - -moz-image-region: rect(63px 92px 84px 69px) !important; + -moz-image-region: rect(30px 119px 59px 90px) !important; } #button-next { - -moz-image-region: rect(147px 23px 168px 0px); + -moz-image-region: rect(180px 29px 209px 0); } #button-next:hover { - -moz-image-region: rect(147px 46px 168px 23px); + -moz-image-region: rect(180px 59px 209px 30px); } #button-next:hover:active { - -moz-image-region: rect(147px 69px 168px 46px); + -moz-image-region: rect(180px 89px 209px 60px); } #button-next[disabled] { - -moz-image-region: rect(147px 92px 168px 69px) !important; + -moz-image-region: rect(180px 119px 209px 90px) !important; } #button-delete { - -moz-image-region: rect(210px 23px 231px 0px); + -moz-image-region: rect(0, 29px 29px 0); } #button-delete:hover { - -moz-image-region: rect(210px 46px 231px 23px); + -moz-image-region: rect(0, 59px 29px 30px); } #button-delete:hover:active { - -moz-image-region: rect(210px 69px 231px 46px); + -moz-image-region: rect(0 89px 29px 60px); } #button-delete[disabled] { - -moz-image-region: rect(210px 92px 231px 69px) !important; + -moz-image-region: rect(0 119px 29px 90px) !important; } #button-mark { - -moz-image-region: rect(336px 23px 357px 0); + -moz-image-region: rect(120px 29px 149px 0); } #button-mark:hover { - -moz-image-region: rect(336px 46px 357px 23px); + -moz-image-region: rect(120px 59px 149px 30px); } #button-mark:hover:active { - -moz-image-region: rect(336px 69px 357px 46px); + -moz-image-region: rect(120px 89px 149px 60px); } #button-mark[disabled] { - -moz-image-region: rect(336px 92px 357px 69px) !important; + -moz-image-region: rect(120px 119px 149px 90px) !important; } -#button-junk{ - -moz-image-region: rect(357px 23px 378px 0); +#button-junk { + -moz-image-region: rect(360px 29px 389px 0); } #button-junk:hover { - -moz-image-region: rect(357px 46px 378px 23px); + -moz-image-region: rect(360px 59px 389px 30px); } #button-junk:hover:active { - -moz-image-region: rect(357px 69px 378px 46px); + -moz-image-region: rect(360px 89px 389px 60px); } #button-junk[disabled="true"] { - -moz-image-region: rect(357px 92px 378px 69px) !important; + -moz-image-region: rect(360px 119px 389px 90px) !important; } #button-print { - list-style-image: url("chrome://communicator/skin/icons/btn1.gif"); - -moz-image-region: rect(0px 23px 21px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(0 29px 29px 0); } #button-print:hover { - -moz-image-region: rect(0px 46px 21px 23px); + -moz-image-region: rect(0 59px 29px 30px); } #button-print:hover:active { - -moz-image-region: rect(0px 69px 21px 46px); + -moz-image-region: rect(0 89px 29px 60px); } #button-print[disabled] { - -moz-image-region: rect(0px 92px 21px 69px) !important; + -moz-image-region: rect(0 119px 29px 90px) !important; } #button-stop { - list-style-image: url("chrome://communicator/skin/icons/btn1.gif"); - -moz-image-region: rect(21px 22px 42px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(30px 29px 59px 0); } #button-stop:hover { - -moz-image-region: rect(21px 44px 42px 22px); + -moz-image-region: rect(30px 59px 59px 30px); } #button-stop:hover:active { - -moz-image-region: rect(21px 66px 42px 44px); + -moz-image-region: rect(30px 89px 59px 60px); } #button-stop[disabled="true"] { - -moz-image-region: rect(21px 88px 42px 66px) !important; + -moz-image-region: rect(30px 119px 59px 90px) !important; } /* ::::: message notification bar style rules ::::: */ diff --git a/themes/classic/messenger/smime/icons/smbtn1.gif b/themes/classic/messenger/smime/icons/smbtn1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/editor/icons/btn1.gif b/themes/classic/messenger/smime/icons/smimeicons.png similarity index 100% rename from themes/classic/editor/icons/btn1.gif rename to themes/classic/messenger/smime/icons/smimeicons.png diff --git a/themes/classic/messenger/smime/msgCompSMIMEOverlay.css b/themes/classic/messenger/smime/msgCompSMIMEOverlay.css index 591870d12b5..e69de29bb2d 100644 --- a/themes/classic/messenger/smime/msgCompSMIMEOverlay.css +++ b/themes/classic/messenger/smime/msgCompSMIMEOverlay.css @@ -1,92 +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. - * - * 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): - * - * 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 ***** */ - -/* ===== msgCompSMIMEOverlay.css ======================================== - == Styles for the S/Mime in composer window. - ======================================================================= */ - -@import url("chrome://messenger/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -#button-security { - list-style-image: url("chrome://messenger/skin/smime/icons/smbtn1.gif"); - -moz-image-region: rect(42px 23px 63px 0px); -} - -#button-security:hover { - -moz-image-region: rect(42px 46px 63px 23px); -} - -#button-security:hover:active { - -moz-image-region: rect(42px 69px 63px 46px); -} - -#button-security[disabled] { - -moz-image-region: rect(42px 92px 63px 69px) !important; -} - - -#msgcomposeWindow #signing-status { - list-style-image: none; - visibility: collapse; -} - -#msgcomposeWindow[signing="ok"] #signing-status { - list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.gif"); - visibility: visible; -} - -#msgcomposeWindow[signing="notok"] #signing-status { - list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.gif"); - visibility: visible; -} - - -#msgcomposeWindow #encryption-status { - list-style-image: none; - visibility: collapse; -} - -#msgcomposeWindow[crypto="ok"] #encryption-status { - list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.gif"); - visibility: visible; -} - -#msgcomposeWindow[crypto="notok"] #encryption-status { - list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.gif"); - visibility: visible; -} diff --git a/themes/classic/navigator/icons/btn1.gif b/themes/classic/navigator/icons/btn1.gif deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/themes/classic/messenger/addressbook/icons/im-act.gif b/themes/classic/navigator/icons/navigatoricons.png similarity index 100% rename from themes/classic/messenger/addressbook/icons/im-act.gif rename to themes/classic/navigator/icons/navigatoricons.png diff --git a/themes/classic/navigator/navigator.css b/themes/classic/navigator/navigator.css index 69879e0ac47..3c7e37e1ac5 100644 --- a/themes/classic/navigator/navigator.css +++ b/themes/classic/navigator/navigator.css @@ -20,6 +20,7 @@ * * Contributor(s): * Joe Hewitt (hewitt@netscape.com) + * Manuel Reimer (Manuel.Reimer@gmx.de) * * 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"), @@ -27,7 +28,7 @@ * 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 +0 * 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 @@ -44,89 +45,91 @@ /* ::::: primary toolbar buttons ::::: */ .toolbarbutton-1 { - list-style-image: url("chrome://navigator/skin/icons/btn1.gif"); + list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png"); } #back-button { - -moz-image-region: rect(0px 19px 20px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(60px 29px 89px 0); } #back-button:hover { - -moz-image-region: rect(0px 38px 20px 19px); + -moz-image-region: rect(60px 59px 89px 30px); } #back-button:hover:active { - -moz-image-region: rect(0px 57px 20px 38px); + -moz-image-region: rect(60px 89px 89px 60px); } #back-button[disabled="true"] { - -moz-image-region: rect(0px 76px 20px 57px) !important; + -moz-image-region: rect(60px 119px 89px 90px) !important; } #forward-button { - -moz-image-region: rect(20px 19px 40px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(90px 29px 119px 0); } #forward-button:hover { - -moz-image-region: rect(20px 38px 40px 19px); + -moz-image-region: rect(90px 59px 119px 30px); } #forward-button:hover:active { - -moz-image-region: rect(20px 57px 40px 38px); + -moz-image-region: rect(90px 89px 119px 60px); } #forward-button[disabled="true"] { - -moz-image-region: rect(20px 76px 40px 57px) !important; + -moz-image-region: rect(90px 119px 119px 90px) !important; } #reload-button { - -moz-image-region: rect(40px 22px 60px 0px); + -moz-image-region: rect(0 29px 29px 0); } #reload-button:hover { - -moz-image-region: rect(40px 44px 60px 22px); + -moz-image-region: rect(0 59px 29px 30px); } #reload-button:hover:active { - -moz-image-region: rect(40px 66px 60px 44px); + -moz-image-region: rect(0 89px 29px 60px); } #reload-button[disabled="true"] { - -moz-image-region: rect(40px 88px 60px 66px) !important; + -moz-image-region: rect(0 119px 29px 90px) !important; } #stop-button { - list-style-image: url("chrome://communicator/skin/icons/btn1.gif"); - -moz-image-region: rect(21px 22px 41px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(30px 29px 59px 0); } #stop-button:hover { - -moz-image-region: rect(21px 44px 41px 22px); + -moz-image-region: rect(30px 59px 59px 30px); } #stop-button:hover:active { - -moz-image-region: rect(21px 66px 41px 44px); + -moz-image-region: rect(30px 89px 59px 60px); } #stop-button[disabled="true"] { - -moz-image-region: rect(21px 88px 41px 66px) !important; + -moz-image-region: rect(30px 119px 59px 90px) !important; } #print-button { - list-style-image: url("chrome://communicator/skin/icons/btn1.gif"); - -moz-image-region: rect(0px 23px 21px 0px); + list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); + -moz-image-region: rect(0 29px 29px 0); } #print-button:hover { - -moz-image-region: rect(0px 46px 21px 23px); + -moz-image-region: rect(0 59px 29px 30px); } #print-button:hover:active { - -moz-image-region: rect(0px 69px 21px 46px); + -moz-image-region: rect(0 89px 29px 60px); } #print-button[disabled="true"] { - -moz-image-region: rect(0px 92px 21px 69px) !important; + -moz-image-region: rect(0 119px 29px 90px) !important; } #fullscreen-exit-button { @@ -269,16 +272,17 @@ } #search-button { - list-style-image: url("chrome://communicator/skin/icons/search.gif"); font-weight: bold; + list-style-image: url("chrome://communicator/skin/icons/search.png"); + -moz-image-region: rect(0 17px 17px 0); } #search-button:hover { - list-style-image: url("chrome://communicator/skin/icons/search-hov.gif"); + -moz-image-region: rect(0 35px 17px 18px); } #search-button:hover:active { - list-style-image: url("chrome://communicator/skin/icons/search-act.gif"); + -moz-image-region: rect(0 53px 17px 36px); } /* ::::: sidebar splitter ::::: */