diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul index 6f27ce7aabc..9ccb4763651 100644 --- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul +++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul @@ -23,7 +23,7 @@ --> - + diff --git a/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN b/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN index 2919f0d0c40..dc15eee6ffc 100644 --- a/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN +++ b/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN @@ -1,2 +1,2 @@ CookieViewer.css -wallet.css \ No newline at end of file + diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in index 0e60524401c..5d8f125a142 100644 --- a/mozilla/extensions/wallet/cookieviewer/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in @@ -46,5 +46,4 @@ install:: $(TARGETS) $(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/chrome/communicator/content/wallet $(INSTALL) $(srcdir)/CookieViewer.properties $(srcdir)/CookieViewer.dtd $(DIST)/bin/chrome/communicator/locale/wallet $(INSTALL) $(srcdir)/CookieViewer.css $(DIST)/bin/chrome/communicator/skin/wallet - $(INSTALL) $(srcdir)/wallet.css $(DIST)/bin/chrome/communicator/skin/wallet diff --git a/mozilla/extensions/wallet/cookieviewer/makefile.win b/mozilla/extensions/wallet/cookieviewer/makefile.win index 5e840696d80..351c377af73 100644 --- a/mozilla/extensions/wallet/cookieviewer/makefile.win +++ b/mozilla/extensions/wallet/cookieviewer/makefile.win @@ -56,7 +56,6 @@ clobber:: rm -f $(DIST)\bin\chrome\communicator\content\wallet\CookieViewer.xul rm -f $(DIST)\bin\chrome\communicator\content\wallet\CookieViewer.js rm -f $(DIST)\bin\chrome\communicator\skin\wallet\CookieViewer.css - rm -f $(DIST)\bin\chrome\communicator\skin\wallet\wallet.css rm -f $(DIST)\bin\chrome\communicator\locale\wallet\CookieViewer.properties rm -f $(DIST)\bin\chrome\communicator\locale\wallet\CookieViewer.dtd diff --git a/mozilla/extensions/wallet/cookieviewer/resources/skin/wallet.css b/mozilla/extensions/wallet/cookieviewer/resources/skin/wallet.css index 5856a8375ee..aa6f5f97603 100644 --- a/mozilla/extensions/wallet/cookieviewer/resources/skin/wallet.css +++ b/mozilla/extensions/wallet/cookieviewer/resources/skin/wallet.css @@ -1 +1,2 @@ -@import url(chrome://global/skin/global.css); +@import url(chrome://communicator/skin/); + diff --git a/mozilla/extensions/wallet/cookieviewer/wallet.css b/mozilla/extensions/wallet/cookieviewer/wallet.css deleted file mode 100644 index 5856a8375ee..00000000000 --- a/mozilla/extensions/wallet/cookieviewer/wallet.css +++ /dev/null @@ -1 +0,0 @@ -@import url(chrome://global/skin/global.css); diff --git a/mozilla/extensions/wallet/editor/WalletEditor.xul b/mozilla/extensions/wallet/editor/WalletEditor.xul index fd536561226..880b23ef3e7 100644 --- a/mozilla/extensions/wallet/editor/WalletEditor.xul +++ b/mozilla/extensions/wallet/editor/WalletEditor.xul @@ -22,7 +22,7 @@ --> - + diff --git a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul index bdd85df63fd..658230a80de 100644 --- a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul +++ b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul @@ -23,7 +23,7 @@ --> - + diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul index 8f07b059b95..bc76db1e45c 100644 --- a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul +++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul @@ -21,7 +21,7 @@ Contributor(s): --> - + diff --git a/mozilla/xpfe/browser/resources/skin/navigator.css b/mozilla/xpfe/browser/resources/skin/navigator.css index 385a27c7757..f6e0ef8a0e3 100644 --- a/mozilla/xpfe/browser/resources/skin/navigator.css +++ b/mozilla/xpfe/browser/resources/skin/navigator.css @@ -1,7 +1,7 @@ /** Contains style definitions for the navigator application **/ -@import url(chrome://global/skin/global.css); +@import url(chrome://communicator/skin/); box#sidebar-parent { margin-right: 2px; diff --git a/mozilla/xpfe/components/bookmarks/resources/MANIFEST-skin b/mozilla/xpfe/components/bookmarks/resources/MANIFEST-skin index 19d6993ab16..890094c4b22 100644 --- a/mozilla/xpfe/components/bookmarks/resources/MANIFEST-skin +++ b/mozilla/xpfe/components/bookmarks/resources/MANIFEST-skin @@ -1,8 +1,4 @@ -bm-find.css -bm-panel.css -bm-props.css bookmarks.css -manage-bookmarks.css bookmark-folder-closed.gif bookmark-folder-open.gif bookmark-item.gif diff --git a/mozilla/xpfe/components/bookmarks/resources/Makefile.in b/mozilla/xpfe/components/bookmarks/resources/Makefile.in index 1de2506649f..fa3e729d7ab 100644 --- a/mozilla/xpfe/components/bookmarks/resources/Makefile.in +++ b/mozilla/xpfe/components/bookmarks/resources/Makefile.in @@ -44,15 +44,11 @@ CHROME_CONTENT = \ $(NULL) CHROME_SKIN = \ - bm-find.css \ - bm-panel.css \ - bm-props.css \ bookmark-folder-closed.gif \ bookmark-folder-open.gif \ bookmark-item.gif \ bookmarks.css \ iefavorite.gif \ - manage-bookmarks.css \ personal-folder-closed.gif \ personal-folder-open.gif \ $(NULL) diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-find.css b/mozilla/xpfe/components/bookmarks/resources/bm-find.css deleted file mode 100755 index 29cd228f42c..00000000000 --- a/mozilla/xpfe/components/bookmarks/resources/bm-find.css +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - -@import url(chrome://global/skin/global.css); diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul index 72dd109ddfd..4bf2af00081 100755 --- a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul +++ b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul @@ -25,7 +25,7 @@ --> - + diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.css b/mozilla/xpfe/components/bookmarks/resources/bm-panel.css deleted file mode 100644 index 7561a5cabb1..00000000000 --- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.css +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - -@import url(chrome://global/skin/global.css); - -treeitem > treerow > treecell > .tree-icon > .twisty{ - display: none; -} diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul index 4ca1070c65a..11feb72aece 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul +++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul @@ -22,8 +22,8 @@ --> + - titledbutton -{ - -moz-border-radius: 8px 8px 0px 0px; - margin-left: 5px; - margin-right: 5px; -} diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul index 03a0d557f1f..9f1bc462771 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul +++ b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul @@ -22,8 +22,8 @@ --> + - diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.css b/mozilla/xpfe/components/bookmarks/resources/bookmarks.css index 1608943e5c7..521acf09834 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.css +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.css @@ -20,7 +20,7 @@ * Contributor(s): */ -@import url(chrome://global/skin/global.css); +@import url(chrome://communicator/skin/); treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > .tree-icon { diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul index 3c2d7a9df9a..eb924c4a54a 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul @@ -22,6 +22,7 @@ --> + diff --git a/mozilla/xpfe/components/bookmarks/resources/makefile.win b/mozilla/xpfe/components/bookmarks/resources/makefile.win index ca34fd91a3b..783912d7c43 100644 --- a/mozilla/xpfe/components/bookmarks/resources/makefile.win +++ b/mozilla/xpfe/components/bookmarks/resources/makefile.win @@ -42,15 +42,11 @@ CHROME_CONTENT = \ $(NULL) CHROME_SKIN = \ - .\bm-find.css \ - .\bm-panel.css \ - .\bm-props.css \ .\bookmark-folder-closed.gif \ .\bookmark-folder-open.gif \ .\bookmark-item.gif \ .\bookmarks.css \ .\iefavorite.gif \ - .\manage-bookmarks.css \ .\personal-folder-closed.gif \ .\personal-folder-open.gif \ $(NULL) diff --git a/mozilla/xpfe/components/bookmarks/resources/manage-bookmarks.css b/mozilla/xpfe/components/bookmarks/resources/manage-bookmarks.css deleted file mode 100644 index 6f3fe74c136..00000000000 --- a/mozilla/xpfe/components/bookmarks/resources/manage-bookmarks.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - -/* - - Style rules specific to the 'manage bookmarks' window. - -*/ - -treeitem > treerow > treecell > .tree-button -{ - list-style-image: none; -} - -treeitem > treerow > treecell > .tree-icon; -{ - list-style-image: url("resource:/res/rdf/document.gif"); -} diff --git a/mozilla/xpfe/components/directory/directory.css b/mozilla/xpfe/components/directory/directory.css index 033788462c1..e349edfc6b8 100644 --- a/mozilla/xpfe/components/directory/directory.css +++ b/mozilla/xpfe/components/directory/directory.css @@ -26,7 +26,7 @@ */ -@import url(chrome://global/skin/global.css); +@import url(chrome://communicator/skin/); treecol[sortActive="true"] { background-color: lightgray; diff --git a/mozilla/xpfe/components/history/resources/MANIFEST-skin b/mozilla/xpfe/components/history/resources/MANIFEST-skin index 3e9c6ffbe7d..e69de29bb2d 100644 --- a/mozilla/xpfe/components/history/resources/MANIFEST-skin +++ b/mozilla/xpfe/components/history/resources/MANIFEST-skin @@ -1 +0,0 @@ -history.css diff --git a/mozilla/xpfe/components/history/resources/Makefile.in b/mozilla/xpfe/components/history/resources/Makefile.in index 44ba09dec91..279c35df657 100644 --- a/mozilla/xpfe/components/history/resources/Makefile.in +++ b/mozilla/xpfe/components/history/resources/Makefile.in @@ -38,8 +38,6 @@ CHROME_CONTENT = \ history-test.js \ $(NULL) -CHROME_SKIN = history.css - EXPORT_RESOURCE_LOCALE = locale/en-US/history.dtd include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/history/resources/history.css b/mozilla/xpfe/components/history/resources/history.css deleted file mode 100644 index c822e5b7717..00000000000 --- a/mozilla/xpfe/components/history/resources/history.css +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - -/* - - Style rules specific to the 'Manage History' panel. - -*/ - -@import url(chrome://global/skin/global.css); diff --git a/mozilla/xpfe/components/history/resources/history.xul b/mozilla/xpfe/components/history/resources/history.xul index af2b0745f53..709a69be0a5 100644 --- a/mozilla/xpfe/components/history/resources/history.xul +++ b/mozilla/xpfe/components/history/resources/history.xul @@ -22,8 +22,7 @@ --> - - + diff --git a/mozilla/xpfe/components/history/resources/makefile.win b/mozilla/xpfe/components/history/resources/makefile.win index 281a1c3383e..2381c69c820 100644 --- a/mozilla/xpfe/components/history/resources/makefile.win +++ b/mozilla/xpfe/components/history/resources/makefile.win @@ -36,7 +36,6 @@ CHROME_CONTENT = \ $(NULL) CHROME_SKIN = \ - .\history.css \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul index 31ad9252a62..ddd6dd4fc32 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul @@ -19,6 +19,8 @@ Contributor(s): --> + + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul index c2345e5cc20..a7460aca637 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul @@ -22,6 +22,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul index c982f3e37c1..6e15b3d155b 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul @@ -21,6 +21,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul index f44db1af5fd..62fbe15214a 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul @@ -20,6 +20,8 @@ Contributor(s): --> + + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul index 127aa084745..303074e73d8 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul @@ -18,6 +18,7 @@ --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul index e17770e0705..97c1aa576e4 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul @@ -21,6 +21,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul index c757a934255..4262839677e 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul @@ -21,6 +21,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul index 89f41e8bf63..7616811a67c 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul @@ -19,6 +19,8 @@ Contributor(s): --> + + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul index 72b25c682f6..272df0169b9 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul @@ -20,6 +20,8 @@ Contributor(s): --> + + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul index b65404f5c0e..903407514b8 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul @@ -21,6 +21,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-editing.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-editing.xul index 68049283718..70b71aa3b92 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-editing.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-editing.xul @@ -21,6 +21,7 @@ Contributor(s): --> + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul index 2b07e93dfb3..249d06cbce6 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul @@ -19,6 +19,8 @@ Contributor(s): --> + + diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul index bbbe0043486..a65176f64ae 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul @@ -21,7 +21,7 @@ Rights Reserved. Contributor(s): ______________________________________. --> - + diff --git a/mozilla/xpfe/components/prefwindow/resources/skin/pref.css b/mozilla/xpfe/components/prefwindow/resources/skin/pref.css index 25e577ef5a2..f86e68a82dc 100644 --- a/mozilla/xpfe/components/prefwindow/resources/skin/pref.css +++ b/mozilla/xpfe/components/prefwindow/resources/skin/pref.css @@ -1,6 +1,3 @@ -@import url(chrome://global/skin/global.css); - -//@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ @namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */ diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css index 12e981372f6..f78e2bab932 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.css @@ -19,8 +19,6 @@ * Contributor(s): Stephen Lamm */ -@import url(chrome://global/skin/global.css); - splitter#sidebar-splitter { margin-right: 2px; margin-top: 2px; diff --git a/mozilla/xpfe/global/resources/skin/MANIFEST b/mozilla/xpfe/global/resources/skin/MANIFEST index 529bc1070ea..784c0968475 100644 --- a/mozilla/xpfe/global/resources/skin/MANIFEST +++ b/mozilla/xpfe/global/resources/skin/MANIFEST @@ -1,114 +1 @@ -tasksOverlay.css -global.css -colors.css -textfield.css -button.css -checkbox.css -tree.css -menubutton.css -menulist.css -radio.css -scrollbars.css -commonDialog.css -dialogOverlay.css -lessCols.gif -lessCols_mo.gif -lessCols_dis.gif -menu-arrow-disabled.gif -menu-arrow-hover.gif -menu-arrow.gif -menu-check-disabled.gif -menu-check-hover.gif -menu-check.gif -menuArrow.gif -menuArrow_dis.gif -menuArrow_mo.gif -menuCheck.gif -menuCheck_dis.gif -menuCheck_mo.gif -moreCols.gif -moreCols_mo.gif -moreCols_dis.gif -scroll-up.gif -scroll-up-hover.gif -scroll-up-disabled.gif -scroll-down.gif -scroll-down-hover.gif -scroll-down-disabled.gif -scroll-left.gif -scroll-left-hover.gif -scroll-left-disabled.gif -scroll-right.gif -scroll-right-hover.gif -scroll-right-disabled.gif -scroll-thumb-vert.gif -scroll-thumb-vert-hover.gif -scroll-thumb-vert-disabled.gif -scroll-thumb-horiz.gif -scroll-thumb-horiz-hover.gif -scroll-thumb-horiz-disabled.gif -opentwisty.gif -opentwisty-selected.gif -closedtwisty.gif -closedtwisty-selected.gif -alert-icon.gif -error-icon.gif -message-icon.gif -question-icon.gif -return.gif -return-disabled.gif -grippy-horizontal-after.gif -grippy-horizontal-before.gif -grippy-vertical-after.gif -grippy-vertical-before.gif -taskbar-addressbook.gif -taskbar-composer.gif -taskbar-mail.gif -taskbar-navigator.gif -taskbar-tab-minimized.gif -taskbar-tab.gif -taskbar-popup-arrow.gif -taskbar-tab-hover.gif -print.gif -stop.gif -button28-bg-active.gif -button28-bg-disabled.gif -button28-bg-hover.gif -button28-bg.gif -button32-bg-active.gif -button32-bg-disabled.gif -button32-bg-hover.gif -button32-bg.gif -gray-bottomleft.gif -gray-bottomright.gif -gray-topright.gif -otherbutton28-bg-hover.gif -otherbutton28-bg-active.gif -navbar-bg.gif -navbar-endcap.gif -navbar-bg-begincap.gif -n-box-navbar.gif -n-box.gif -toolbar-begincap.gif -toolbar-dropdown.gif -toolbar-dropdown-hover.gif -toolbar-endcap.gif -toolbar-menu-arrow.gif -toolbar-menu-arrow-disabled.gif -toolbar-menu-arrow-hover.gif -search.gif -animthrob.gif -animthrob_single.gif -progressmeter-busy.gif -wizardOverlay.css -seltab-leftedge.gif -seltab-rightedge.gif -tab-leftedge.gif -tab-rightedge.gif -sortAscending.gif -sortDescending.gif -check-check.gif -check-check-disabled.gif -check-radio.gif -check-radio-disabled.gif - +communicator.css diff --git a/mozilla/xpfe/global/resources/skin/global.css b/mozilla/xpfe/global/resources/skin/global.css index 5a10cf7e08a..3c127bf60a6 100644 --- a/mozilla/xpfe/global/resources/skin/global.css +++ b/mozilla/xpfe/global/resources/skin/global.css @@ -17,8 +17,8 @@ @import url(chrome://global/skin/colors.css); @import url(chrome://global/skin/textfield.css); -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ -@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */ +@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for HTML elements */ /********************************** * Window diff --git a/mozilla/xpfe/global/resources/skin/tree.css b/mozilla/xpfe/global/resources/skin/tree.css index 1548078984a..40ee234e88e 100644 --- a/mozilla/xpfe/global/resources/skin/tree.css +++ b/mozilla/xpfe/global/resources/skin/tree.css @@ -28,18 +28,13 @@ treeitem[selected="true"] > treerow { background-color: #CCCCCC; } -tree:focus treeitem[selected="true"] > treerow { - color: white; - background-color: #336699; -} - treecell { white-space: nowrap; vertical-align: middle; padding: 1px 0px 1px 2px; } -treehead > treerow > treecell { +.treecell-header { background-color: #CCCCCC; color: black; border-right: 1px solid white; @@ -47,7 +42,7 @@ treehead > treerow > treecell { padding: 0px 0px 0px 5px; } -tree.inset > treehead > treerow > treecell { +.treecell-inset-header { border-top: 1px solid white; border-bottom: 1px solid #666666; border-left: 1px solid white; @@ -61,36 +56,6 @@ tree.inset > treehead > treerow > treecell.sortable:active { border-right: 1px solid white; } -treecell.image > titledbutton { - text-decoration: none; - margin: 0px; - padding: 0px; -} - -treecell.image > titledbutton:hover { - text-decoration: none; - margin: 0px; - padding: 0px; -} - -treecell.image > titledbutton:active { - text-decoration: none; - margin: 0px; - padding: 0px; -} - -.tree-icon { - width: 100%; -} - -.tree-button { - margin: 0px; - padding: 0px; - border: none; - list-style-image: inherit; - width: 100%; -} - /** class="propertylist" ****************************************** * class for cells in grid-formatted property lists. **/ @@ -100,51 +65,53 @@ treecell.propertylist { border-bottom: 1px solid #CCCCCC; } -treeitem > treerow > treecell > .twisty { - border: none; - padding: 0px; - margin: 0px; - width: 16px; - list-style-image: url("chrome://global/skin/closedtwisty.gif"); - user-focus:ignore; +.tree-cell-primary-icon { + list-style-image: inherit; + padding-right: 2px; } -treeitem[selected="true"] > treerow > treecell > .twisty { +.tree-cell-twisty { + list-style-image: url("chrome://global/skin/closedtwisty.gif"); + user-focus:ignore; + padding-right: 2px; +} + +treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty { list-style-image: url("chrome://global/skin/closedtwisty-selected.gif"); } -.twisty:hover { +.tree-cell-twisty:hover { text-decoration: none; } -.twisty:active { +.tree-cell-twisty:active { text-decoration: none; } -treeitem[empty="true"] > treerow > treecell > titledbutton.twisty { +treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { + list-style-image: none !important; +} + +.tree-cell-twisty[disabled="true"] { list-style-image: none; } -treeitem > treerow > treecell > .twisty[disabled="true"] { - list-style-image: none; -} - -treeitem[container="true"][open="true"] > treerow > treecell > .twisty { +treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty { list-style-image: url("chrome://global/skin/opentwisty.gif"); } -treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .twisty { +treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-cell-twisty { list-style-image: url("chrome://global/skin/opentwisty-selected.gif"); } /* tree header with sort direction indicators */ -treecell.sortDirectionIndicator[sortDirection="ascending"] > .treeheader-sortdirection { +treecell.sortDirectionIndicator[sortDirection="ascending"] > .tree-header-sortdirection { list-style-image: url("chrome://global/skin/sortAscending.gif"); margin-right: 3px; } -treecell.sortDirectionIndicator[sortDirection="descending"] > .treeheader-sortdirection { +treecell.sortDirectionIndicator[sortDirection="descending"] > .tree-header-sortdirection { list-style-image: url("chrome://global/skin/sortDescending.gif"); margin-right: 3px; } diff --git a/mozilla/xpfe/global/resources/skin/xul.css b/mozilla/xpfe/global/resources/skin/xul.css index c22150afe86..338c54ff0bc 100644 --- a/mozilla/xpfe/global/resources/skin/xul.css +++ b/mozilla/xpfe/global/resources/skin/xul.css @@ -196,15 +196,24 @@ treechildren { treecell { display: table-cell; + vertical-align: middle; behavior: url("resource:/chrome/xulBindings.xml#treecell"); } -treecell[indent="true"] { - behavior: url("resource:/chrome/xulBindings.xml#treecell-indented-leaf"); +.treecell-indent { + behavior: url("resource:/chrome/xulBindings.xml#treecell-indented"); } -treeitem[container="true"] > treerow > treecell[indent="true"] { - behavior: url("resource:/chrome/xulBindings.xml#treecell-indented-folder"); +.treecell-iconic { + behavior: url("resource:/chrome/xulBindings.xml#treecell-iconic"); +} + +.treecell-image { + behavior: url("resource:/chrome/xulBindings.xml#treecell-image"); +} + +.treecell-header { + behavior: url("resource:/chrome/xulBindings.xml#treecell-header"); } treeitem > treechildren { @@ -223,10 +232,6 @@ treecolgroup { display: table-column-group; } -treehead > treerow > treecell { - behavior: url("resource:/chrome/xulBindings.xml#treecell-header"); -} - /********** Tab widget *********/ tab { diff --git a/mozilla/xpfe/global/resources/skin/xulBindings.xml b/mozilla/xpfe/global/resources/skin/xulBindings.xml index 2bac921abc4..37aa5acdda3 100644 --- a/mozilla/xpfe/global/resources/skin/xulBindings.xml +++ b/mozilla/xpfe/global/resources/skin/xulBindings.xml @@ -89,36 +89,39 @@ - - + + - - + + + - - - - - + + + + + + + + + + - - + + - - - - + + + +