second attempt at 19557, skinnable sidebar. r=hyatt

2000-05-22 04:14:49 +00:00 · 2000-05-22 04:14:49 +00:00 · cd3c5bfb42
--- a/themes/modern/communicator/sidebar/MANIFEST
+++ b/themes/modern/communicator/sidebar/MANIFEST
@ -9,7 +9,6 @@ sidebar-bottomright-cap.gif
 sidebar-icon.gif
 sidebar-topright-cap.gif
 sidebar.css
-sidebarOverlay.css
 sbgrippy-left-hover.gif
 sbgrippy-left.gif
 sbgrippy-right-hover.gif
--- a/themes/modern/communicator/sidebar/Makefile.in
+++ b/themes/modern/communicator/sidebar/Makefile.in
@ -41,7 +41,6 @@ EXPORT_RESOURCE_SAMPLES = \
        sidebar.css \
        list-down.gif \
        sidebar-bottomright-cap.gif \
-        sidebarOverlay.css \
        sidebarSplitterBindings.xml \
 	sbgrippy-left-hover.gif \
 	sbgrippy-left.gif \
--- a/themes/modern/communicator/sidebar/makefile.win
+++ b/themes/modern/communicator/sidebar/makefile.win
@ -39,7 +39,6 @@ install::
 	$(MAKE_INSTALL) sidebar-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
 	$(MAKE_INSTALL) sidebar-topright-cap.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
 	$(MAKE_INSTALL) sidebar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
-	$(MAKE_INSTALL) sidebarOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
 	$(MAKE_INSTALL) sidebarSplitterBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
 	$(MAKE_INSTALL) sbgrippy-left-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
 	$(MAKE_INSTALL) sbgrippy-left.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
--- a/themes/modern/communicator/sidebar/sidebar.css
+++ b/themes/modern/communicator/sidebar/sidebar.css
@ -1 +1,212 @@
-@import url(chrome://global/skin/global.css);
+/* 
+ * 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 Corp. Portions created by Netscape Communications
+ * Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Stephen Lamm <slamm@netscape.com>
+ */ 
+
+#sidebar-splitter {
+    margin-right: 1px;
+    margin-top: 1px;
+    padding: 0px;
+    border: none;
+    background-color: #003366;
+    behavior: 
+        url("chrome://communicator/skin/sidebar/sidebarSplitterBindings.xml#sidebar-splitter");
+}
+
+.sidebar-splitter-topright-cap {
+    min-height: 8px; 
+    background-repeat: no-repeat;
+    background-position: 100% 0%;
+    background-image:
+        url("chrome://communicator/skin/sidebar/sidebar-topright-cap.gif"); 
+}
+
+.sidebar-splitter-bottomright-cap {
+    min-height: 8px; 
+    background-repeat: no-repeat;
+    background-position: 100% 100%;
+    background-image:
+        url("chrome://communicator/skin/sidebar/sidebar-bottomright-cap.gif"); 
+}
+
+.sidebar-splitter-grippy {
+    background-color: transparent;
+    margin: 0px;
+    padding: 0px;
+    background-image:
+       url("chrome://communicator/skin/sidebar/sbgrippy-left.gif"); 
+    background-repeat: no-repeat;
+    background-position: 50% 50%;
+}
+
+.sidebar-splitter-grippy:hover,
+.sidebar-splitter-grippy:active {
+    background-color: transparent;
+    background-image:
+       url("chrome://communicator/skin/sidebar/sbgrippy-left-hover.gif"); 
+}
+
+#sidebar-splitter[collapsed="true"] .sidebar-splitter-grippy {
+    background-image:
+       url("chrome://communicator/skin/sidebar/sbgrippy-right.gif"); 
+}
+
+#sidebar-splitter[collapsed="true"] .sidebar-splitter-grippy:hover,
+#sidebar-splitter[collapsed="true"] .sidebar-splitter-grippy:active {
+    background-image:
+       url("chrome://communicator/skin/sidebar/sbgrippy-right-hover.gif"); 
+}
+
+#sidebar-status-grippy {
+    padding: 2px 2px 2px 0px;
+    background-color: #003366;
+    background-image:
+       url("chrome://communicator/skin/sidebar/sidebar-open.gif"); 
+}
+#sidebar-status-grippy:hover {
+    background-image:
+       url("chrome://communicator/skin/sidebar/sidebar-open-hover.gif"); 
+}
+#sidebar-status-grippy[open="true"] {
+    background-image:
+       url("chrome://communicator/skin/sidebar/sidebar-close.gif"); 
+}
+#sidebar-status-grippy[open="true"]:hover {
+    background-image:
+       url("chrome://communicator/skin/sidebar/sidebar-close-hover.gif"); 
+}
+
+/**/
+
+#sidebar-box {
+    margin-top: 1px;
+    border: none;
+    border-bottom: 8px solid #003366;
+}
+
+.text-panel-loading {
+    margin: 5px 0px;
+}
+.image-panel-loading {
+    margin: 5px;
+    list-style-image: url("chrome://global/skin/loading.gif"); 
+}
+
+/*
+ *    Sidebar and Panel title buttons
+ */
+.sidebarheader-main {
+    color: #CCFFFF;
+    background-color: #003366;
+    border: 0px !important;
+    padding-left: 4px;
+}
+.sidebarheader-main > text {
+    font-weight: bold;
+    margin: 2px;
+}
+
+#sidebar-panel-picker:hover {
+    background-color: #336699;
+}
+#sidebar-panel-picker > .menu-right {
+    list-style-image: url("chrome://global/skin/toolbar-menu-arrow.gif");
+    padding-right: 2px;
+}
+#sidebar-panel-picker > .menu-text {
+    color: #CCFFFF;
+    padding-left: 4px;
+}
+#sidebar-panel-picker > .menu-accel {
+    display: none;
+}
+
+/**
+ * texttab folder lookalike e.g. for sidebar panel headers
+ */
+  .box-texttab
+    {
+      behavior            : url("chrome://communicator/content/sidebar/sidebarBindings.xml#texttab");
+      background-color    : #CCCCCC;
+      padding-top         : 2px;
+    }
+
+  .box-texttab[selected="true"] 
+    {
+      border-bottom       : 1px solid #FFFFFF;
+    }    
+    
+  .box-texttab[top-panel="true"]
+    {
+      background-color    : #003366;
+    }
+  
+  .box-texttab[first-panel-after-selected="true"] 
+    {
+      background-color    : #FFFFFF;
+    }
+
+  .box-texttab-right-space 
+    {
+      width               : 30px;
+      border-bottom       : 1px solid #000000;
+    }
+
+  .box-texttab[last-panel="true"] > .box-texttab-right-space 
+    {
+      border-bottom       : none;
+    }
+
+  .box-texttab[last-panel="true"][selected="true"] > .box-texttab-right-space 
+    {
+      border-bottom       : 1px solid #000000;
+    } 
+
+  .box-texttab-left
+    {
+      list-style-image    : url("chrome://global/skin/tab-leftedge.gif");
+    }
+
+  .box-texttab-right
+    {
+      list-style-image    : url("chrome://global/skin/tab-rightedge.gif");
+    }
+
+  .box-texttab[selected="true"] > .box-texttab-left
+    {
+      list-style-image    : url("chrome://global/skin/seltab-leftedge.gif");
+    }
+
+  .box-texttab[selected="true"] > .box-texttab-right
+    {
+      list-style-image    : url("chrome://global/skin/seltab-rightedge.gif");
+    }
+
+  .box-texttab-text-container
+    {
+      border-top          : 1px solid #000000;
+      background-color    : #CCCCCC;
+    }
+
+  .box-texttab[selected="true"] > .box-texttab-text-container
+    {
+      background-color    : #FFFFFF;
+      font-weight         : bold;
+    }
+    
--- a/themes/modern/communicator/sidebar/sidebarOverlay.css
+++ b/themes/modern/communicator/sidebar/sidebarOverlay.css
--- a/themes/modern/editor/editor.css
+++ b/themes/modern/editor/editor.css
@ -21,11 +21,12 @@
 */

@import url(chrome://communicator/skin/);
+@import url(chrome://communicator/skin/sidebar/sidebar.css);
 /* Note: most of our styles are in EditorToolbars.css 
   in order to share with all users of editor
 */

-iframe#content-frame { 
+#content-frame { 
  min-width: 10px; 
  min-height: 10px;
  height: 400px;
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@ -19,6 +19,7 @@
 */

@import url(chrome://communicator/skin/);
+@import url(chrome://communicator/skin/sidebar/sidebar.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/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@ -3,6 +3,7 @@

@import url(chrome://communicator/skin/);
@import url(chrome://communicator/skin/bookmarks/bookmarks.css);
+@import url(chrome://communicator/skin/sidebar/sidebar.css);


 #sidebar-parent 
--- a/xpfe/components/sidebar/resources/MANIFEST-content
+++ b/xpfe/components/sidebar/resources/MANIFEST-content
@ -1,9 +0,0 @@
-customize-panel.js
-customize-panel.xul
-customize.js
-customize.xul
-preview.js
-preview.xul
-sidebarOverlay.js
-sidebarOverlay.xul
-local-panels.rdf
--- a/xpfe/components/sidebar/resources/Makefile.in
+++ b/xpfe/components/sidebar/resources/Makefile.in
@ -31,8 +31,10 @@ CHROME_CONTENT_DIR = packages/core/communicator/content/sidebar
 CHROME_L10N_DIR = locales/en-US/communicator/locale/sidebar

 CHROME_CONTENT = \
+	sidebarOverlay.css \
 	customize-panel.js \
 	customize-panel.xul \
+	sidebarBindings.xml \
 	customize.js \
 	customize.xul \
 	preview.js \
--- a/xpfe/components/sidebar/resources/makefile.win
+++ b/xpfe/components/sidebar/resources/makefile.win
@ -26,8 +26,10 @@ CHROME_CONTENT_DIR = packages\core\communicator\content\sidebar
 CHROME_L10N_DIR = locales\en-US\communicator\locale\sidebar

 CHROME_CONTENT = \
+        .\sidebarOverlay.css \
        .\customize-panel.js \
        .\customize-panel.xul \
+        .\sidebarBindings.xml \
        .\customize.js \
        .\customize.xul \
 	.\preview.js \
--- a/xpfe/components/sidebar/resources/preview.xul
+++ b/xpfe/components/sidebar/resources/preview.xul
@ -37,11 +37,10 @@

  <script src="chrome://communicator/content/sidebar/preview.js" />

-  <box id="paneltitle" class="texttab texttab-sidebar"
-    align="left" selected="true"/>
+  <box id="paneltitle" class="box-texttab texttab-sidebar" selected="true"/>

 <!--  <iframe id="previewframe" type="content" src="about:blank" flex="1"/>-->
-  <iframe class="inset" id="previewframe" type="content" src="about:blank" flex="1"/>
+  <iframe class="box-panel" id="previewframe" type="content" src="about:blank" flex="1"/>

  <separator class="groove"/>
  
--- a/xpfe/components/sidebar/resources/sidebarBindings.xml
+++ b/xpfe/components/sidebar/resources/sidebarBindings.xml
@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<bindings id="globalBindings"
+  xmlns="http://www.mozilla.org/xbl"
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  
+<!--
+  <binding id="texttab">
+    <content>
+      <xul:box allowevents="true" class="texttab-internal-box" flex="1">
+        <xul:text inherits="value,accesskey,crop"/>
+      </xul:box>
+    </content>
+  </binding>
+  -->
+  
+  <binding id="texttab">
+    <content>
+      <xul:image class="box-texttab-left"/>
+      <xul:box class="box-texttab-text-container" orient="vertical" inherits="value"
+                autostretch="always" flex="1">
+        <xul:spring flex="1"/>
+        <xul:text class="box-texttab-text" inherits="value" crop="right"/>
+        <xul:spring flex="1"/>
+      </xul:box>
+      <xul:image class="box-texttab-right"/>
+      <xul:spring class="box-texttab-right-space"/>
+    </content>
+  </binding>
+
+  <binding id="sidebar-header-box" extends="xul:box">
+    <content>
+      <xul:text inherits="value,crop" crop="right" flex="1"/>
+      <xul:box><children/></xul:box>
+    </content>
+  </binding>  
+
+  <binding id="sidebar-header-splitter" extends="xul:splitter">
+    <content>
+      <xul:text inherits="value,crop" crop="right" flex="1"/>
+      <xul:box><children/></xul:box>
+    </content>
+  </binding>  
+
+</bindings>
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.xul
@ -18,7 +18,7 @@

 -->
 
-<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarOverlay.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 

 <!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">

--- a/xpfe/global/resources/content/MANIFEST
+++ b/xpfe/global/resources/content/MANIFEST
@ -1,4 +1,3 @@
-globalBindings.xml
 browserBindings.xul
 editorBindings.xul
 inputBindings.xul
--- a/xpfe/global/resources/content/Makefile.in
+++ b/xpfe/global/resources/content/Makefile.in
@ -48,7 +48,6 @@ CHROME_CONTENT= \
 		inputBindings.xul \
 		textAreaBindings.xul \
 		hiddenWindow.xul \
-		globalBindings.xml \
 		globalOverlay.xul \
 		globalOverlay.js \
 		tasksOverlay.xul \
--- a/xpfe/global/resources/content/globalBindings.xml
+++ b/xpfe/global/resources/content/globalBindings.xml
--- a/xpfe/global/resources/content/makefile.win
+++ b/xpfe/global/resources/content/makefile.win
@ -39,7 +39,6 @@ CHROME_CONTENT= \
 	.\inputBindings.xul \
 	.\textAreaBindings.xul \
 	.\hiddenWindow.xul \
-	.\globalBindings.xml \
 	.\globalOverlay.xul \
 	.\globalOverlay.js \
 	.\tasksOverlay.xul \