diff --git a/mozilla/browser/base/jar.mn b/mozilla/browser/base/jar.mn index f96e088ca20..00abcbf2474 100644 --- a/mozilla/browser/base/jar.mn +++ b/mozilla/browser/base/jar.mn @@ -26,11 +26,13 @@ classic.jar: skin/classic/browser/Close-tab.png (skin/Close-tab.png) skin/classic/browser/Go.png (skin/Go.png) skin/classic/browser/Info.png (skin/Info.png) - skin/classic/browser/Search-bar.png (skin/search-bar.png) + skin/classic/browser/Search-bar.png (skin/Search-bar.png) skin/classic/browser/Secure.png (skin/Secure.png) skin/classic/browser/Security-broken.png (skin/Security-broken.png) - skin/classic/browser/Throbber-small.png (skin/Throbber-small.png) skin/classic/browser/Throbber.png (skin/Throbber.png) + skin/classic/browser/Throbber.mng (skin/Throbber.mng) + skin/classic/browser/Throbber-small.png (skin/Throbber-small.png) + skin/classic/browser/Throbber-small.mng (skin/Throbber-small.mng) skin/classic/browser/Toolbar-small.png (skin/Toolbar-small.png) skin/classic/browser/Toolbar.png (skin/Toolbar.png) skin/classic/browser/lock-insecure.gif (skin/lock-insecure.gif) diff --git a/mozilla/browser/base/skin/Bookmarks-folder.png b/mozilla/browser/base/skin/Bookmarks-folder.png index 1c17c1363fd..903fb9b5b22 100644 Binary files a/mozilla/browser/base/skin/Bookmarks-folder.png and b/mozilla/browser/base/skin/Bookmarks-folder.png differ diff --git a/mozilla/browser/base/skin/Close-tab.png b/mozilla/browser/base/skin/Close-tab.png index 99b73c5ed5b..f2e6816ec24 100644 Binary files a/mozilla/browser/base/skin/Close-tab.png and b/mozilla/browser/base/skin/Close-tab.png differ diff --git a/mozilla/browser/base/skin/Search-bar.png b/mozilla/browser/base/skin/Search-bar.png new file mode 100644 index 00000000000..261aeac0f37 Binary files /dev/null and b/mozilla/browser/base/skin/Search-bar.png differ diff --git a/mozilla/browser/base/skin/Secure.png b/mozilla/browser/base/skin/Secure.png index 43ab665c69d..382ea8cd0a5 100644 Binary files a/mozilla/browser/base/skin/Secure.png and b/mozilla/browser/base/skin/Secure.png differ diff --git a/mozilla/browser/base/skin/Security-broken.png b/mozilla/browser/base/skin/Security-broken.png index a854e78e66b..92a01d75728 100644 Binary files a/mozilla/browser/base/skin/Security-broken.png and b/mozilla/browser/base/skin/Security-broken.png differ diff --git a/mozilla/browser/base/skin/Throbber-small.mng b/mozilla/browser/base/skin/Throbber-small.mng new file mode 100644 index 00000000000..0e76ffe9d0c Binary files /dev/null and b/mozilla/browser/base/skin/Throbber-small.mng differ diff --git a/mozilla/browser/base/skin/Throbber-small.png b/mozilla/browser/base/skin/Throbber-small.png index a99d17c02ee..66b2d877a0b 100644 Binary files a/mozilla/browser/base/skin/Throbber-small.png and b/mozilla/browser/base/skin/Throbber-small.png differ diff --git a/mozilla/browser/base/skin/Throbber.mng b/mozilla/browser/base/skin/Throbber.mng new file mode 100644 index 00000000000..94c922c6557 Binary files /dev/null and b/mozilla/browser/base/skin/Throbber.mng differ diff --git a/mozilla/browser/base/skin/Throbber.png b/mozilla/browser/base/skin/Throbber.png index 43f1a6c0b16..aa2f2779813 100644 Binary files a/mozilla/browser/base/skin/Throbber.png and b/mozilla/browser/base/skin/Throbber.png differ diff --git a/mozilla/browser/base/skin/Toolbar-small.png b/mozilla/browser/base/skin/Toolbar-small.png index eaa6889be3b..3f5349b9cc4 100644 Binary files a/mozilla/browser/base/skin/Toolbar-small.png and b/mozilla/browser/base/skin/Toolbar-small.png differ diff --git a/mozilla/browser/base/skin/Toolbar.png b/mozilla/browser/base/skin/Toolbar.png index 57a81bf1db5..32c5670be15 100644 Binary files a/mozilla/browser/base/skin/Toolbar.png and b/mozilla/browser/base/skin/Toolbar.png differ diff --git a/mozilla/browser/base/skin/browser.css b/mozilla/browser/base/skin/browser.css index e317045a056..8f5449a8309 100644 --- a/mozilla/browser/base/skin/browser.css +++ b/mozilla/browser/base/skin/browser.css @@ -596,20 +596,18 @@ statusbarpanel#statusbar-display { min-width: 0; background-color: transparent; list-style-image: url("chrome://browser/skin/Throbber.png"); - -moz-image-region: rect(0px, 32px, 32px, 0px); } #navigator-throbber[busy="true"] { - -moz-image-region: rect(0px, 64px, 32px, 32px); + list-style-image: url("chrome://browser/skin/Throbber.mng"); } toolbar[iconsize="small"] #navigator-throbber, toolbar[mode="text"] #navigator-throbber { list-style-image: url("chrome://browser/skin/Throbber-small.png"); - -moz-image-region: rect(0px, 20px, 20px, 0px); } toolbar[iconsize="small"] #navigator-throbber[busy="true"], toolbar[mode="text"] #navigator-throbber[busy="true"] { - -moz-image-region: rect(0px, 40px, 20px, 20px); + list-style-image: url("chrome://browser/skin/Throbber-small.mng"); } .tabs-closebutton { @@ -618,11 +616,11 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] { #content .tabs-closebutton { list-style-image: url("chrome://browser/skin/Close-tab.png"); - -moz-image-region: rect(0px, 20px, 16px, 0px); + -moz-image-region: rect(0px, 18px, 14px, 0px); } #content .tabs-closebutton:hover { - -moz-image-region: rect(0px, 40px, 16px, 20px); + -moz-image-region: rect(0px, 36px, 14px, 18px); } toolbarbutton.chevron { diff --git a/mozilla/browser/base/skin/search-bar.png b/mozilla/browser/base/skin/search-bar.png deleted file mode 100644 index 549e5d9a576..00000000000 Binary files a/mozilla/browser/base/skin/search-bar.png and /dev/null differ diff --git a/mozilla/browser/components/bookmarks/skin/Bookmarks-toolbar.png b/mozilla/browser/components/bookmarks/skin/Bookmarks-toolbar.png index d3a094b1477..8e866c00bda 100644 Binary files a/mozilla/browser/components/bookmarks/skin/Bookmarks-toolbar.png and b/mozilla/browser/components/bookmarks/skin/Bookmarks-toolbar.png differ diff --git a/mozilla/browser/components/prefwindow/skin/Options.png b/mozilla/browser/components/prefwindow/skin/Options.png index 8f021c0bb2b..6c447684466 100644 Binary files a/mozilla/browser/components/prefwindow/skin/Options.png and b/mozilla/browser/components/prefwindow/skin/Options.png differ diff --git a/mozilla/toolkit/components/console/jar.mn b/mozilla/toolkit/components/console/jar.mn index 8268855ee7a..6f912295a00 100644 --- a/mozilla/toolkit/components/console/jar.mn +++ b/mozilla/toolkit/components/console/jar.mn @@ -1,14 +1,15 @@ toolkit.jar: -* content/global/console.js (content/console.js) -* content/global/console.xul (content/console.xul) - content/global/console.css (content/console.css) - content/global/consoleBindings.xml (content/consoleBindings.xml) +*+ content/global/console.js (content/console.js) +*+ content/global/console.xul (content/console.xul) + content/global/console.css (content/console.css) + content/global/consoleBindings.xml (content/consoleBindings.xml) classic.jar: -+ skin/classic/global/console/console.css (skin/console.css) - skin/classic/global/console/console-error-caret.gif (skin/console-error-caret.gif) - skin/classic/global/console/console-error-dash.gif (skin/console-error-dash.gif) ++ skin/classic/global/console/console.css (skin/console.css) + skin/classic/global/console/console-error-caret.gif (skin/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (skin/console-error-dash.gif) + skin/classic/global/console/Console-toolbar.png (skin/Console-toolbar.png) en-US.jar: -* locale/en-US/global/console.dtd (locale/console.dtd) - locale/en-US/global/console.properties (locale/console.properties) +*+ locale/en-US/global/console.dtd (locale/console.dtd) ++ locale/en-US/global/console.properties (locale/console.properties) diff --git a/mozilla/toolkit/components/console/skin/Console-toolbar.png b/mozilla/toolkit/components/console/skin/Console-toolbar.png new file mode 100644 index 00000000000..64558bee0ab Binary files /dev/null and b/mozilla/toolkit/components/console/skin/Console-toolbar.png differ diff --git a/mozilla/toolkit/components/console/skin/console.css b/mozilla/toolkit/components/console/skin/console.css index 3343cde3c4a..0d602554904 100644 --- a/mozilla/toolkit/components/console/skin/console.css +++ b/mozilla/toolkit/components/console/skin/console.css @@ -13,7 +13,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. @@ -22,7 +22,7 @@ * Joe Hewitt * * 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 + * 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 @@ -106,18 +106,15 @@ /* ::::: icons ::::: */ .console-row[type="error"], -.console-row[type="exception"], -toolbarbutton[observes="Console:modeErrors"] { +.console-row[type="exception"] { list-style-image: url("chrome://global/skin/icons/Error.png"); } -.console-row[type="warning"], -toolbarbutton[observes="Console:modeWarnings"] { +.console-row[type="warning"] { list-style-image: url("chrome://global/skin/icons/Warning.png"); } -.console-row[type="message"], -toolbarbutton[observes="Console:modeMessages"] { +.console-row[type="message"] { list-style-image: url("chrome://global/skin/icons/Message.png"); } @@ -134,3 +131,46 @@ toolbarbutton[observes="Console:modeMessages"] { toolbarseparator { min-height: 1em; } + + +/* Toolbar icons */ + +toolbar#ToolbarMode toolbarbutton { + list-style-image: url("chrome://global/skin/console/Console-toolbar.png"); +} + +toolbarbutton[observes="Console:modeAll"] { + -moz-image-region: rect(0px, 32px, 32px, 0px); +} +toolbarbutton[observes="Console:modeAll"]:hover, +toolbarbutton[observes="Console:modeAll"][checked="true"] { + -moz-image-region: rect(32px, 32px, 64px, 0px); +} + +toolbarbutton[observes="Console:modeErrors"] { + -moz-image-region: rect(0px, 64px, 32px, 32px); +} +toolbarbutton[observes="Console:modeErrors"]:hover, +toolbarbutton[observes="Console:modeErrors"][checked="true"] { + -moz-image-region: rect(32px, 64px, 64px, 32px); +} + +toolbarbutton[observes="Console:modeWarnings"] { + -moz-image-region: rect(0px, 96px, 32px, 64px); +} +toolbarbutton[observes="Console:modeWarnings"]:hover, +toolbarbutton[observes="Console:modeWarnings"][checked="true"] { + -moz-image-region: rect(32px, 96px, 64px, 64px); +} + +toolbarbutton[observes="Console:modeMessages"] { + -moz-image-region: rect(0px, 128px, 32px, 96px); +} +toolbarbutton[observes="Console:modeMessages"]:hover, +toolbarbutton[observes="Console:modeMessages"][checked="true"] { + -moz-image-region: rect(32px, 128px, 64px, 96px); +} + +toolbar#ToolbarMode toolbarbutton[observes="Console:clear"] { + list-style-image: none; +} diff --git a/mozilla/toolkit/components/filepicker/skin/Filepicker.png b/mozilla/toolkit/components/filepicker/skin/Filepicker.png index c7ff2e121ea..d36cd761579 100644 Binary files a/mozilla/toolkit/components/filepicker/skin/Filepicker.png and b/mozilla/toolkit/components/filepicker/skin/Filepicker.png differ diff --git a/mozilla/toolkit/skin/win/browser.css b/mozilla/toolkit/skin/win/browser.css index 06ca6ab662d..8ee9dfd5a1c 100644 --- a/mozilla/toolkit/skin/win/browser.css +++ b/mozilla/toolkit/skin/win/browser.css @@ -28,7 +28,7 @@ tabpanels { } tab[busy] > .tab-icon { - list-style-image: url("chrome://global/skin/icons/page-loading.png"); + list-style-image: url("chrome://global/skin/icons/Loading.mng"); } tab[selected="true"] { diff --git a/mozilla/toolkit/skin/win/icons/Loading.mng b/mozilla/toolkit/skin/win/icons/Loading.mng new file mode 100644 index 00000000000..fe179d8c380 Binary files /dev/null and b/mozilla/toolkit/skin/win/icons/Loading.mng differ diff --git a/mozilla/toolkit/skin/win/icons/page-loading.png b/mozilla/toolkit/skin/win/icons/page-loading.png deleted file mode 100644 index f982bad89ff..00000000000 Binary files a/mozilla/toolkit/skin/win/icons/page-loading.png and /dev/null differ diff --git a/mozilla/toolkit/skin/win/jar.mn b/mozilla/toolkit/skin/win/jar.mn index 710d4dec0c3..942c31205da 100644 --- a/mozilla/toolkit/skin/win/jar.mn +++ b/mozilla/toolkit/skin/win/jar.mn @@ -53,7 +53,7 @@ classic.jar: + skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) + skin/classic/global/icons/Error.png (icons/Error.png) + skin/classic/global/icons/folder-item.png (icons/folder-item.png) -+ skin/classic/global/icons/page-loading.png (icons/page-loading.png) ++ skin/classic/global/icons/Loading.mng (icons/Loading.mng) + skin/classic/global/icons/Message.png (icons/Message.png) + skin/classic/global/icons/Question.png (icons/Question.png) + skin/classic/global/icons/Warning.png (icons/Warning.png)