Beginning the process of massaging the CSS and XUL to conform to the new

directory org.
2025-04-02 20:42:49 +00:00 · 2000-04-21 09:40:38 +00:00 · 2000-04-21 09:40:38 +00:00 · ed7eedafdf
commit ed7eedafdf
parent bb0ce46710
48 changed files with 93 additions and 388 deletions
--- a/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/extensions/wallet/cookieviewer/CookieViewer.xul
@ -23,7 +23,7 @@
 -->

 <!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://communicator/skin/wallet/wallet.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!-- CHANGE THIS WHEN MOVING FILES -->
--- a/extensions/wallet/cookieviewer/MANIFEST_SKIN
+++ b/extensions/wallet/cookieviewer/MANIFEST_SKIN
@ -1,2 +1,2 @@
 CookieViewer.css
-wallet.css
+
--- a/extensions/wallet/cookieviewer/Makefile.in
+++ b/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

--- a/extensions/wallet/cookieviewer/makefile.win
+++ b/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

--- a/extensions/wallet/cookieviewer/resources/skin/wallet.css
+++ b/extensions/wallet/cookieviewer/resources/skin/wallet.css
@ -1 +1,2 @@
-@import url(chrome://global/skin/global.css);
+@import url(chrome://communicator/skin/);
+
--- a/extensions/wallet/cookieviewer/wallet.css
+++ b/extensions/wallet/cookieviewer/wallet.css
@ -1 +0,0 @@
-@import url(chrome://global/skin/global.css);
--- a/extensions/wallet/editor/WalletEditor.xul
+++ b/extensions/wallet/editor/WalletEditor.xul
@ -22,7 +22,7 @@
 -->

 <!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://communicator/skin/wallet/wallet.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!-- CHANGE THIS WHEN MOVING FILES -->
--- a/extensions/wallet/signonviewer/SignonViewer.xul
+++ b/extensions/wallet/signonviewer/SignonViewer.xul
@ -23,7 +23,7 @@
 -->

 <!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://communicator/skin/wallet/wallet.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

 <!-- CHANGE THIS WHEN MOVING FILES -->
--- a/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/extensions/wallet/walletpreview/WalletPreview.xul
@ -21,7 +21,7 @@
  Contributor(s):
 -->

-<?xml-stylesheet href="chrome://communicator/skin/wallet/wallet.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/SignonViewer.dtd" >

--- a/xpfe/browser/resources/skin/navigator.css
+++ b/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;
--- a/xpfe/components/bookmarks/resources/MANIFEST-skin
+++ b/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
--- a/xpfe/components/bookmarks/resources/Makefile.in
+++ b/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)
--- a/xpfe/components/bookmarks/resources/bm-find.css
+++ b/xpfe/components/bookmarks/resources/bm-find.css
@ -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);
--- a/xpfe/components/bookmarks/resources/bm-find.xul
+++ b/xpfe/components/bookmarks/resources/bm-find.xul
@ -25,7 +25,7 @@

 -->

-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bm-find.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bm-find.dtd">
--- a/xpfe/components/bookmarks/resources/bm-panel.css
+++ b/xpfe/components/bookmarks/resources/bm-panel.css
@ -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;
-}
--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@ -22,8 +22,8 @@

 -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bm-panel.css" type="text/css"?>

 <window
  xmlns:html="http://www.w3.org/TR/REC-html40"
--- a/xpfe/components/bookmarks/resources/bm-props.css
+++ b/xpfe/components/bookmarks/resources/bm-props.css
@ -1,35 +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);
-
-window
-{
-	margin-top: 2px;
-}
-
-#Tabs > titledbutton
-{
-	-moz-border-radius: 8px 8px 0px 0px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
--- a/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/xpfe/components/bookmarks/resources/bm-props.xul
@ -22,8 +22,8 @@

 -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bm-props.css" type="text/css"?>

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/bookmarks/resources/bookmarks.css
+++ b/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
 {
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@ -22,6 +22,7 @@

 -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/manage-bookmarks.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>

--- a/xpfe/components/bookmarks/resources/makefile.win
+++ b/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)
--- a/xpfe/components/bookmarks/resources/manage-bookmarks.css
+++ b/xpfe/components/bookmarks/resources/manage-bookmarks.css
@ -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");
-}
--- a/xpfe/components/directory/directory.css
+++ b/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;
--- a/xpfe/components/history/resources/MANIFEST-skin
+++ b/xpfe/components/history/resources/MANIFEST-skin
@ -1 +0,0 @@
-history.css
--- a/xpfe/components/history/resources/Makefile.in
+++ b/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
--- a/xpfe/components/history/resources/history.css
+++ b/xpfe/components/history/resources/history.css
@ -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);
--- a/xpfe/components/history/resources/history.xul
+++ b/xpfe/components/history/resources/history.xul
@ -22,8 +22,7 @@

 -->

-<?xml-stylesheet href="chrome://communicator/skin/history/history.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/bookmarks/manage-bookmarks.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >
--- a/xpfe/components/history/resources/makefile.win
+++ b/xpfe/components/history/resources/makefile.win
@ -36,7 +36,6 @@ CHROME_CONTENT = \
 	$(NULL)

 CHROME_SKIN = \
-	.\history.css \
 	$(NULL)

 include <$(DEPTH)\config\rules.mak>
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@ -19,6 +19,8 @@
   
   Contributor(s): 
  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@ -22,6 +22,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@ -21,6 +21,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@ -20,6 +20,8 @@
   
   Contributor(s): 
  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-charset.xul
@ -18,6 +18,7 @@

 -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@ -21,6 +21,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-composer.xul
@ -21,6 +21,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@ -19,6 +19,8 @@
   
   Contributor(s): 
  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@ -20,6 +20,8 @@
   
   Contributor(s): 
  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@ -21,6 +21,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-editing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-editing.xul
@ -21,6 +21,7 @@
   Contributor(s): 
  -->

+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-wallet.xul
@ -19,6 +19,8 @@
   
   Contributor(s): 
  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

--- a/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/xpfe/components/prefwindow/resources/content/pref.xul
@ -21,7 +21,7 @@ Rights Reserved.

 Contributor(s): ______________________________________. -->

-
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?> 
 <?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>
 <?xul-overlay href="chrome://global/content/platformDialogOverlay.xul"?>
--- a/xpfe/components/prefwindow/resources/skin/pref.css
+++ b/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 */


--- a/xpfe/components/sidebar/resources/sidebarOverlay.css
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.css
@ -19,8 +19,6 @@
 * Contributor(s): Stephen Lamm <slamm@netscape.com>
 */ 

-@import url(chrome://global/skin/global.css);
-
 splitter#sidebar-splitter {
 	margin-right: 2px;
 	margin-top: 2px;
--- a/xpfe/global/resources/skin/MANIFEST
+++ b/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
--- a/xpfe/global/resources/skin/global.css
+++ b/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
--- a/xpfe/global/resources/skin/tree.css
+++ b/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;
 }
--- a/xpfe/global/resources/skin/xul.css
+++ b/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 {
--- a/xpfe/global/resources/skin/xulBindings.xml
+++ b/xpfe/global/resources/skin/xulBindings.xml
@ -89,36 +89,39 @@
 	  </handlers>
  </binding>

-  <binding id="treecell-indented-folder">
-    <content>
+  <binding id="treecell-indented">
+    <content autostretch="never">
      <xul:treeindentation/>
-      <xul:titledbutton class="twisty" allowevents="true"/>
-      <xul:titledbutton class="tree-icon tree-button" inherits="crop,value,align,src" 
-                    flex="1" align="left" crop="right"/>
+      <xul:image class="tree-cell-twisty" twisty="true" allowevents="true"/>
+      <xul:image class="tree-cell-primary-icon" inherits="src"/>
+      <xul:text class="tree-cell-text" inherits="crop,value,align" flex="1" crop="right"/>
    </content>
  </binding>

-  <binding id="treecell-indented-leaf">
-    <content>
-      <xul:treeindentation/>
-      <xul:titledbutton class="twisty" disabled="true" allowevents="true"/>
-      <xul:titledbutton class="tree-icon tree-button" inherits="crop,value,align,src" 
-                    flex="1" align="left" crop="right"/>
+  <binding id="treecell-iconic">
+    <content autostretch="never">
+      <xul:image class="tree-cell-icon" inherits="src"/>
+      <xul:text class="tree-cell-text" inherits="crop,value,align" flex="1" crop="right"/>
+    </content>
+  </binding>
+
+  <binding id="treecell-image">
+    <content autostretch="never">
+      <xul:image class="tree-cell-image" inherits="src"/>
    </content>
  </binding>

  <binding id="treecell">
-    <content>
-      <xul:titledbutton class="tree-button" inherits="crop,value,align,src" 
-                    flex="1" align="left" crop="right"/>
+    <content autostretch="never">
+      <xul:text class="tree-cell-text" inherits="crop,value,align" flex="1" crop="right"/>
    </content>
  </binding>

  <binding id="treecell-header">
-    <content>
-      <xul:image class="tree-button" inherits="src"/>
-      <xul:text class="tree-text" inherits="crop,value" flex="1" crop="right"/>
-      <xul:image class="treeheader-sortdirection"/>
+    <content autostretch="never">
+      <xul:image class="tree-header-image" inherits="src"/>
+      <xul:text class="tree-header-text" inherits="crop,value" flex="1" crop="right"/>
+      <xul:image class="tree-header-sortdirection"/>
    </content>
  </binding>
				`@ -1 +0,0 @@`
				`@import url(chrome://global/skin/global.css);`