accomodate recent XUL 1.0 changes

diff --git a/EarlyBlue/communicator/skin/brand.css b/EarlyBlue/communicator/skin/brand.css
index df5186eef8946468bc7b239e15834f389b284b30..00adaef54d569d57b7fe480dc3cb92527afb1131 100755 (executable)
--- a/EarlyBlue/communicator/skin/brand.css
+++ b/EarlyBlue/communicator/skin/brand.css
@@ -1,43 +1,42 @@
-\r
-#navigator-throbber\r
-  {\r
-    list-style-image      : url("chrome://global/skin/animthrob_single.gif");\r
-    min-width             : 36px;\r
-    min-height            : 36px;\r
-    vertical-align        : middle;\r
-    padding               : 1px;\r
-    margin                : 2px 4px 2px 1px;\r
-    border                : none;\r
-    cursor                : pointer;\r
-  }  \r
-\r
-#navigator-throbber[busy="true"]\r
-  {\r
-    list-style-image      : url("chrome://global/skin/animthrob.gif");\r
-  }\r
-  \r
-#navigator-throbber:hover:active\r
-  {\r
-    padding               : 2px 0px 0px 2px;\r
-  }\r
-\r
-#navigator-throbber > .button-internal-box\r
-  {\r
-    border                : 1px solid transparent;\r
-    padding               : 0px;\r
-  }\r
-\r
-#navigator-throbber:hover > .button-internal-box\r
-  {\r
-    border                : 1px outset #CCD0DD;\r
-  }\r
-\r
-#navigator-throbber:hover:active > .button-internal-box\r
-  {\r
-    border                : 1px inset #CCD0DD;\r
-  }\r
-\r
-#navigator-throbber > .button-internal-box > .button-text-container\r
-  {\r
-    display               : none;\r
-  }  
\ No newline at end of file
+#navigator-throbber
+  {
+    list-style-image      : url("chrome://global/skin/animthrob_single.gif");
+    min-width             : 36px;
+    min-height            : 36px;
+    -moz-box-align        : center;  /* We're in a hbox */
+    padding               : 1px;
+    margin                : 2px 4px 2px 1px;
+    border                : none;
+    cursor                : pointer;
+  }  
+
+#navigator-throbber[busy="true"]
+  {
+    list-style-image      : url("chrome://global/skin/animthrob.gif");
+  }
+  
+#navigator-throbber:hover:active
+  {
+    padding               : 2px 0px 0px 2px;
+  }
+
+#navigator-throbber > .button-internal-box
+  {
+    border                : 1px solid transparent;
+    padding               : 0px;
+  }
+
+#navigator-throbber:hover > .button-internal-box
+  {
+    border                : 1px outset #CCD0DD;
+  }
+
+#navigator-throbber:hover:active > .button-internal-box
+  {
+    border                : 1px inset #CCD0DD;
+  }
+
+#navigator-throbber > .button-internal-box > .button-text-container
+  {
+    display               : none;
+  }

diff --git a/EarlyBlue/communicator/skin/button.css b/EarlyBlue/communicator/skin/button.css
index f83f8493a46ff42cc1bd8db02758c5816e9d363f..8eff4f1c280cc76c249e0c11f0c539903c6240ee 100755 (executable)
--- a/EarlyBlue/communicator/skin/button.css
+++ b/EarlyBlue/communicator/skin/button.css
@@ -97,26 +97,26 @@
   .button-toolbar-1 > .button-internal-box
     {
       border              : 1px solid transparent;
   .button-toolbar-1 > .button-internal-box
     {
       border              : 1px solid transparent;

-      vertical-align      : middle;
+      -moz-box-align      : center;

     }
     
   .button-toolbar-1:hover > .button-internal-box
     {
       border              : 1px outset #CCD0DD;
     }
     
   .button-toolbar-1:hover > .button-internal-box
     {
       border              : 1px outset #CCD0DD;

-      vertical-align      : middle;
+      -moz-box-align      : center;

     }
     
   .button-toolbar-1:hover:active > .button-internal-box
     {
       border              : 1px inset #CCD0DD;
     }
     
   .button-toolbar-1:hover:active > .button-internal-box
     {
       border              : 1px inset #CCD0DD;

-      vertical-align      : middle;
+      -moz-box-align      : center;

       padding             : 2px 0px 0px 2px;
     }
     
   .button-toolbar-1 > .button-internal-box > .button-text-container 
     {
       display             : none;
       padding             : 2px 0px 0px 2px;
     }
     
   .button-toolbar-1 > .button-internal-box > .button-text-container 
     {
       display             : none;

-      text-align          : center;
+      -moz-box-pack       : center;

     }
     
 /** Styles for the standard 'large' toolbar button, these buttons are used for
     }
     
 /** Styles for the standard 'large' toolbar button, these buttons are used for


@@ -140,7 +140,7 @@
     {
       border              : 1px solid transparent;
       padding             : 1px; 
     {
       border              : 1px solid transparent;
       padding             : 1px; 

-      vertical-align      : middle;
+      -moz-box-align      : center;

     }
 
   .button-toolbar-2:hover > .button-internal-box
     }
 
   .button-toolbar-2:hover > .button-internal-box


@@ -167,7 +167,7 @@
   .button-toolbar-2 > .button-internal-box > .button-text-container 
     {
       padding-top         : 3px;
   .button-toolbar-2 > .button-internal-box > .button-text-container 
     {
       padding-top         : 3px;

-      text-align          : center;
+      -moz-box-pack       : center;

     }
 
 
     }
 
 


@@ -287,5 +287,3 @@ menubutton.button-toolbar-4
     padding               : 0px;
     padding-left          : 2px;
   }
     padding               : 0px;
     padding-left          : 2px;
   }

-
-

diff --git a/EarlyBlue/communicator/skin/dialogOverlay.css b/EarlyBlue/communicator/skin/dialogOverlay.css
index d5f9b4b332e93d2a0e29f599db2501434b37c836..f1a9b5970db66a09c52fb8c72368921fbe8f04f9 100755 (executable)
--- a/EarlyBlue/communicator/skin/dialogOverlay.css
+++ b/EarlyBlue/communicator/skin/dialogOverlay.css
@@ -1,118 +1,116 @@
-/**  \r
- * Small Dialog Header (without icon)\r
- **/\r
-.box-smallheader \r
-  {\r
-    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#smallheader);\r
-    border                : 1px inset #CCD0DD;\r
-    margin                : 0px 5px 6px 5px;\r
-  }\r
-\r
-.toolbar-primary\r
-  {\r
-    padding               : 0px 0px 3px 0px;\r
-    min-height            : 0px;\r
-  }\r
-\r
-.box-smallheader-left \r
-  {\r
-    font-size             : larger;\r
-    font-weight           : bold;\r
-    color                 : #FFFFFF;\r
-    padding-left          : 6px;\r
-  }\r
-\r
-.box-smallheader-right \r
-  {\r
-    color                 : #FFFFFF;\r
-    padding-right         : 6px;\r
-  }\r
-\r
-.box-smallheader > .toolbar-primary \r
-  {\r
-    background-color      : #666699;\r
-    vertical-align        : middle;\r
-    padding-top           : 3px;\r
-  }\r
-\r
-/** \r
- * Large Dialog Header (with icon) \r
- **/\r
-.box-header \r
-  {\r
-    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#largeheader);\r
-  }\r
-\r
-.box-header-header \r
-  {\r
-    padding               : 0px 0px 4px 5px;\r
-    min-height            : 34px;\r
-  }\r
-\r
-.box-header-text-box \r
-  {\r
-    vertical-align        : middle;\r
-  }\r
-\r
-.box-header-text \r
-  {\r
-    color                 : white;\r
-    font-size             : large;\r
-    font-weight           : bold;\r
-    text-decoration       : underline;\r
-  }\r
-\r
-.box-header-icon-box  \r
-  {\r
-    vertical-align        : middle;\r
-  }\r
-  \r
-.box-header-circle \r
-  {\r
-    background-color      : transparent;\r
-    min-width             : 28px;\r
-    margin                : 1px 7px 1px 1px;\r
-    height                : 28px;\r
-    width                 : 28px;\r
-  }  \r
-\r
-/**\r
- * Dialog status line (blue) including progress area\r
- **/\r
-.box-status \r
-  {\r
-    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#status);\r
-  }\r
-\r
-.box-status-bg \r
-  {\r
-    padding               : 1px 5px 1px 5px;\r
-    min-height            : 0px ! important;\r
-  }\r
-\r
-.box-status-text, .box-status-progress\r
-  {\r
-    color                 : #9999cc ! important;\r
-  }\r
-\r
-  \r
-/** \r
- * Utility classes for use when combined headers/footers are used\r
- **/\r
-/* display area framed container */\r
-#contentarea \r
-  {\r
-    border-top            : 2px groove #CCD0DD;\r
-    border-bottom         : 2px groove #CCD0DD;\r
-    padding               : 7px;\r
-  }\r
-\r
-/* top border on status area */\r
-#wizardButtons \r
-  {\r
-    border-bottom         : 1px outset #CCD0DD;\r
-    padding-top           : 1px;\r
-    padding-bottom        : 1px;\r
-  }\r
-\r
-\r
+/**  
+ * Small Dialog Header (without icon)
+ **/
+.box-smallheader 
+  {
+    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#smallheader);
+    border                : 1px inset #CCD0DD;
+    margin                : 0px 5px 6px 5px;
+  }
+
+.toolbar-primary
+  {
+    padding               : 0px 0px 3px 0px;
+    min-height            : 0px;
+  }
+
+.box-smallheader-left 
+  {
+    font-size             : larger;
+    font-weight           : bold;
+    color                 : #FFFFFF;
+    padding-left          : 6px;
+  }
+
+.box-smallheader-right 
+  {
+    color                 : #FFFFFF;
+    padding-right         : 6px;
+  }
+
+.box-smallheader > .toolbar-primary 
+  {
+    background-color      : #666699;
+    -moz-box-align        : center;
+    padding-top           : 3px;
+  }
+
+/** 
+ * Large Dialog Header (with icon) 
+ **/
+.box-header 
+  {
+    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#largeheader);
+  }
+
+.box-header-header 
+  {
+    padding               : 0px 0px 4px 5px;
+    min-height            : 34px;
+  }
+
+.box-header-text-box 
+  {
+    -moz-box-align        : center;
+  }
+
+.box-header-text 
+  {
+    color                 : white;
+    font-size             : large;
+    font-weight           : bold;
+    text-decoration       : underline;
+  }
+
+.box-header-icon-box  
+  {
+    -moz-box-align        : center;
+  }
+  
+.box-header-circle 
+  {
+    background-color      : transparent;
+    min-width             : 28px;
+    margin                : 1px 7px 1px 1px;
+    height                : 28px;
+    width                 : 28px;
+  }  
+
+/**
+ * Dialog status line (blue) including progress area
+ **/
+.box-status 
+  {
+    -moz-binding          : url(chrome://communicator/content/dialogBindings.xml#status);
+  }
+
+.box-status-bg 
+  {
+    padding               : 1px 5px 1px 5px;
+    min-height            : 0px ! important;
+  }
+
+.box-status-text, .box-status-progress
+  {
+    color                 : #9999cc ! important;
+  }
+
+  
+/** 
+ * Utility classes for use when combined headers/footers are used
+ **/
+/* display area framed container */
+#contentarea 
+  {
+    border-top            : 2px groove #CCD0DD;
+    border-bottom         : 2px groove #CCD0DD;
+    padding               : 7px;
+  }
+
+/* top border on status area */
+#wizardButtons 
+  {
+    border-bottom         : 1px outset #CCD0DD;
+    padding-top           : 1px;
+    padding-bottom        : 1px;
+  }

diff --git a/EarlyBlue/communicator/skin/menubutton.css b/EarlyBlue/communicator/skin/menubutton.css
index 30eab187bb254e19c99e0ca7ec3d5437b9301fdc..aada9d10444ede6f5c9ba756b5aa0aecedbc108c 100755 (executable)
--- a/EarlyBlue/communicator/skin/menubutton.css
+++ b/EarlyBlue/communicator/skin/menubutton.css
@@ -92,7 +92,7 @@
 .menubutton-dual-ex-button > .button-internal-box > .button-text-container 
   {
     padding-top             : 3px;
 .menubutton-dual-ex-button > .button-internal-box > .button-text-container 
   {
     padding-top             : 3px;

-    text-align              : center;
+    -moz-box-pack           : center;

   }
 
 
   }
 
 


@@ -174,8 +174,3 @@ menubutton > .menubutton-dual-dropmarker-box > .menubutton-dropmarker
 /*    padding-bottom           : 17px;  */
     padding-bottom           : 24px;  
   }
 /*    padding-bottom           : 17px;  */
     padding-bottom           : 24px;  
   }

-
-
-
-
-

diff --git a/EarlyBlue/communicator/skin/menubuttonBindings.xml b/EarlyBlue/communicator/skin/menubuttonBindings.xml
index a0fa81341d4df8fb86530ccbc9747e29b44b206d..949d6b9e33de0d237b9f2c490b3b8724dad32a05 100755 (executable)
--- a/EarlyBlue/communicator/skin/menubuttonBindings.xml
+++ b/EarlyBlue/communicator/skin/menubuttonBindings.xml
@@ -10,9 +10,9 @@
       <xul:stack>
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>
       <xul:stack>
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>

-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="top" flex="1">
+        <xul:hbox class="menubutton-dual-dropmarker-box" autostretch="never" align="start" flex="1">

           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>

-        </xul:box>
+        </xul:hbox>

       </xul:stack>
     </content>
   </binding>
       </xul:stack>
     </content>
   </binding>


@@ -21,9 +21,9 @@
     <content excludes="observes,template,menupopup">
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>
     <content excludes="observes,template,menupopup">
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>

-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="top" flex="1">
+        <xul:hbox class="menubutton-dual-dropmarker-box" autostretch="never" align="start" flex="1">

           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>

-        </xul:box>
+        </xul:hbox>

     </content>
   </binding>
 
     </content>
   </binding>
 


@@ -31,18 +31,18 @@
     <content excludes="observes,template,menupopup">
         <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>
     <content excludes="observes,template,menupopup">
         <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value=label,crop,accesskey,disabled"/>

-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="top" flex="1">
+        <xul:hbox class="menubutton-dual-dropmarker-box" autostretch="never" align="start" flex="1">

           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>

-        </xul:box>
+        </xul:hbox>

     </content>
   </binding>
 
   <binding id="menubutton-ubhist" extends="xul:menubutton">
     <content excludes="observes,template,menupopup">
       <xul:button class="button-toolbar-3">
     </content>
   </binding>
 
   <binding id="menubutton-ubhist" extends="xul:menubutton">
     <content excludes="observes,template,menupopup">
       <xul:button class="button-toolbar-3">

-        <xul:box class="button-internal-box">
+        <xul:hbox class="button-internal-box">

           <xul:image inherits="disabled"/>
           <xul:image inherits="disabled"/>

-        </xul:box>
+        </xul:hbox>

       </xul:button>
     </content>
   </binding>
       </xul:button>
     </content>
   </binding>

diff --git a/EarlyBlue/communicator/skin/search/search.css b/EarlyBlue/communicator/skin/search/search.css
index d283ff64443ac88a8aaa36ef4ab11c2894bb1d7f..f5de6dbd5bd5362227fd04b02932c59b08321332 100755 (executable)
--- a/EarlyBlue/communicator/skin/search/search.css
+++ b/EarlyBlue/communicator/skin/search/search.css
@@ -1,108 +1,106 @@
-box.sidebartitle {\r
-  background-color: #505888;\r
-  padding: 2px 3px 3px 3px;\r
-  border: 0px;\r
-  margin: 0px;\r
-  font: 10pt sans-serif;\r
-}\r
-\r
-box.panelbar {\r
-  background-color: #006870;\r
-  padding: 2px 3px 3px 3px;\r
-  border: 0px;\r
-  margin: 0px;\r
-  font: 10pt sans-serif;\r
-}\r
-\r
-box#sidebox {\r
-  width: 100%;\r
-  height: 100%;\r
-}\r
-\r
-titledbutton.sidebartitle:hover { \r
-  border: 0px;\r
-  margin: 1px; \r
-}\r
-\r
-titledbutton.paneltitle { \r
-  horizontal-align: left;\r
-}\r
-\r
-treecol.checkboxColumn {\r
-  width: 30px ! important;\r
-}\r
-\r
-box.spaced { \r
-  padding-top: 5px;\r
-  paddimg-bottom: 2px;\r
-}\r
-\r
-box#engineTabs {\r
-  background-color: #808080;\r
-  border-bottom: 1px solid threedhighlight;\r
-}\r
-\r
-box#engineTabs > titledbutton {\r
-  background-color: #CCCCCC;\r
-  margin-bottom: 0px;\r
-  border-bottom: 1px solid #CCCCCC;\r
-}\r
-\r
-titledbutton#allEngines {\r
-  margin-right: 12px;\r
-}\r
-\r
-titledbutton.engine[loading="true"] {\r
- list-style-image: url("chrome://communicator/skin/bookmarks/loading.gif") ! important ;\r
-}\r
-\r
-titledbutton.iconic {\r
- list-style-image: url("chrome://communicator/skin/bookmarks/document.gif") ! important ;\r
-}\r
-\r
-treeitem > treerow.searchresult > treecell > titledbutton {\r
-   cursor: pointer;\r
-}\r
-\r
-treeitem > treerow.searchresult > treecell {\r
-   color: black;\r
-   text-decoration: none;\r
-}\r
-\r
-treeitem > treerow.searchresult > treecell:hover {\r
-   color: blue;\r
-   text-decoration: underline;\r
-}\r
-\r
-treeitem > treerow.searchresult > treecell > titledbutton:active {\r
-   color: red;\r
-   text-decoration: underline;\r
-}\r
-\r
-/*undo regular search tree selection look*/\r
-treeitem[selected="true"] > treerow.searchresult { \r
-  background-color: transparent;\r
-}\r
-\r
-\r
-\r
-.searchpanel-outerbox {\r
-       padding: 8px 4px 4px 4px;\r
-}\r
-\r
-.indented-label {\r
-       padding-left: 8px;\r
-}\r
-\r
-titledbutton.panelbtn {\r
-       margin-left: 1em; \r
-       margin-right: 1em; \r
-}\r
-\r
-#searchengines\r
-  {\r
-    margin-left           : 0px;\r
-    margin-right          : 0px;\r
-  }\r
-  \r
-  
\ No newline at end of file
+box.sidebartitle {
+  background-color: #505888;
+  padding: 2px 3px 3px 3px;
+  border: 0px;
+  margin: 0px;
+  font: 10pt sans-serif;
+}
+
+box.panelbar {
+  background-color: #006870;
+  padding: 2px 3px 3px 3px;
+  border: 0px;
+  margin: 0px;
+  font: 10pt sans-serif;
+}
+
+box#sidebox {
+  width: 100%;
+  height: 100%;
+}
+
+titledbutton.sidebartitle:hover { 
+  border: 0px;
+  margin: 1px; 
+}
+
+titledbutton.paneltitle { 
+  -moz-box-pack: start;
+}
+
+treecol.checkboxColumn {
+  width: 30px ! important;
+}
+
+box.spaced { 
+  padding-top: 5px;
+  padding-bottom: 2px;
+}
+
+box#engineTabs {
+  background-color: #808080;
+  border-bottom: 1px solid threedhighlight;
+}
+
+box#engineTabs > titledbutton {
+  background-color: #CCCCCC;
+  margin-bottom: 0px;
+  border-bottom: 1px solid #CCCCCC;
+}
+
+titledbutton#allEngines {
+  margin-right: 12px;
+}
+
+titledbutton.engine[loading="true"] {
+ list-style-image: url("chrome://communicator/skin/bookmarks/loading.gif") ! important ;
+}
+
+titledbutton.iconic {
+ list-style-image: url("chrome://communicator/skin/bookmarks/document.gif") ! important ;
+}
+
+treeitem > treerow.searchresult > treecell > titledbutton {
+   cursor: pointer;
+}
+
+treeitem > treerow.searchresult > treecell {
+   color: black;
+   text-decoration: none;
+}
+
+treeitem > treerow.searchresult > treecell:hover {
+   color: blue;
+   text-decoration: underline;
+}
+
+treeitem > treerow.searchresult > treecell > titledbutton:active {
+   color: red;
+   text-decoration: underline;
+}
+
+/*undo regular search tree selection look*/
+treeitem[selected="true"] > treerow.searchresult { 
+  background-color: transparent;
+}
+
+
+
+.searchpanel-outerbox {
+       padding: 8px 4px 4px 4px;
+}
+
+.indented-label {
+       padding-left: 8px;
+}
+
+titledbutton.panelbtn {
+       margin-left: 1em; 
+       margin-right: 1em; 
+}
+
+#searchengines
+  {
+    margin-left           : 0px;
+    margin-right          : 0px;
+  }

diff --git a/EarlyBlue/communicator/skin/sidebar/customize.css b/EarlyBlue/communicator/skin/sidebar/customize.css
index 482ba77f404f689c0d63cafeb438d6ca31f1baf8..bfc2e1e684f5bc44b852bb97922a44e91645413d 100755 (executable)
--- a/EarlyBlue/communicator/skin/sidebar/customize.css
+++ b/EarlyBlue/communicator/skin/sidebar/customize.css
@@ -1,88 +1,88 @@
-/* -*- Mode: C; c-basic-offset: 2 -*-\r
- *\r
- * The contents of this file are subject to the Netscape Public\r
- * License Version 1.1 (the "License"); you may not use this file\r
- * except in compliance with the License. You may obtain a copy of\r
- * the License at http://www.mozilla.org/NPL/\r
- *\r
- * Software distributed under the License is distributed on an "AS\r
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or\r
- * implied. See the License for the specific language governing\r
- * rights and limitations under the License.\r
- *\r
- * The Original Code is mozilla.org code.\r
- *\r
- * The Initial Developer of the Original Code is Netscape\r
- * Communications Corporation.  Portions created by Netscape are\r
- * Copyright (C) 1998 Netscape Communications Corporation. All\r
- * Rights Reserved.\r
- *\r
- * Contributor(s): \r
- */\r
-\r
-/*\r
-\r
-   Style rules specific to the Customize dialog.\r
-\r
-*/\r
-\r
-/* These rules apply appropriate images to the 'reorder' buttons */\r
-.up {\r
-  list-style-image:url("chrome://global/skin/scroll-up.gif");\r
-  min-width: 0px;\r
-}\r
-\r
-.up[disabled="true"] {\r
-  list-style-image:url("chrome://global/skin/scroll-up-disabled.gif");\r
-}\r
-\r
-.down {\r
-  min-width: 0px;\r
-  list-style-image:url("chrome://global/skin/scroll-down.gif");\r
-}\r
-\r
-.down[disabled="true"] {\r
-  list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");\r
-}\r
-\r
-.treecell-panel\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");\r
-}\r
-\r
-.treecell-panel[selected="true"]\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-sel.gif");\r
-}\r
-\r
-.treecell-panel[haslink="true"],\r
-treeitem[container="true"] > treerow > .treecell-panel\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");\r
-}\r
-treeitem[selected="true"] > treerow > .treecell-panel[haslink="true"],\r
-treeitem[selected="true"][container="true"] > treerow > .treecell-panel\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");\r
-}\r
-\r
-treeitem[container="true"][open="true"] > treerow > .treecell-panel\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");\r
-}\r
-treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-panel\r
-{\r
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");\r
-}\r
-\r
-#header {\r
-  list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");\r
-}\r
-\r
-.tree-cell-twisty {\r
- display: none !important;\r
-}\r
-\r
-box#reorder {\r
-  text-align: center;\r
-}\r
+/* -*- 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 Customize dialog.
+
+*/
+
+/* These rules apply appropriate images to the 'reorder' buttons */
+.up {
+  list-style-image:url("chrome://global/skin/scroll-up.gif");
+  min-width: 0px;
+}
+
+.up[disabled="true"] {
+  list-style-image:url("chrome://global/skin/scroll-up-disabled.gif");
+}
+
+.down {
+  min-width: 0px;
+  list-style-image:url("chrome://global/skin/scroll-down.gif");
+}
+
+.down[disabled="true"] {
+  list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");
+}
+
+.treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+}
+
+.treecell-panel[selected="true"]
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-sel.gif");
+}
+
+.treecell-panel[haslink="true"],
+treeitem[container="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+}
+treeitem[selected="true"] > treerow > .treecell-panel[haslink="true"],
+treeitem[selected="true"][container="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
+}
+
+treeitem[container="true"][open="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+}
+treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-panel
+{
+ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
+}
+
+#header {
+  list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");
+}
+
+.tree-cell-twisty {
+ display: none !important;
+}
+
+box#reorder {
+  -moz-box-pack: center;
+}

diff --git a/EarlyBlue/communicator/skin/sidebar/sidebar.css b/EarlyBlue/communicator/skin/sidebar/sidebar.css
index 92c6f7b4779cf5e9e8c9db9d4b25aca4256b9188..dd4c319cd5de25f828ba9bdfd61fdda71579971b 100755 (executable)
--- a/EarlyBlue/communicator/skin/sidebar/sidebar.css
+++ b/EarlyBlue/communicator/skin/sidebar/sidebar.css
@@ -80,7 +80,7 @@
     background-color: #666699;
     border: 0px !important;
     padding-left: 4px;
     background-color: #666699;
     border: 0px !important;
     padding-left: 4px;

-    vertical-align: middle;
+    -moz-box-align: center;

 }
 .sidebarheader-main > .sidebar-header-text {
     font-weight: bold;
 }
 .sidebarheader-main > .sidebar-header-text {
     font-weight: bold;


@@ -171,6 +171,3 @@
       background-color    : #FFFFFF;
       font-weight         : bold;
     }
       background-color    : #FFFFFF;
       font-weight         : bold;
     }

-    
-
-

diff --git a/EarlyBlue/communicator/skin/splitter.css b/EarlyBlue/communicator/skin/splitter.css
index 8dd3c5d7655bbe5080c0f55e59ea6a85aa5eb379..2ae88ddfa402ad9be1a02abfcd637ab8d0f6278e 100755 (executable)
--- a/EarlyBlue/communicator/skin/splitter.css
+++ b/EarlyBlue/communicator/skin/splitter.css
@@ -68,26 +68,6 @@ rows > splitter {
         cursor: n-resize;
 }
 
         cursor: n-resize;
 }
 

-/* for backwards compatibility */
-box[align="vertical"]>splitter > grippy,
-window[align="vertical"]>splitter > grippy {
-       /* a horizontal splitter */
-        background-image: url("chrome://global/skin/grippy-horizontal-after.gif"); 
-       width: 120px;
-       height: 8px;
-}
-
-box[align="vertical"]>splitter[state="collapsed"] > grippy,
-window[align="vertical"]>splitter[state="collapsed"] > grippy {
-        background-image: url("chrome://global/skin/grippy-horizontal-before.gif"); 
-}
-
-box[align="vertical"]>splitter,
-window[align="vertical"]>splitter {
-       /* a vertical splitter */
-    cursor: n-resize;
-}
-

 /**
  * gray horizontal splitter for pane views
  */
 /**
  * gray horizontal splitter for pane views
  */


@@ -135,4 +115,3 @@ splitter.gray-horizontal-splitter > #endcap {
        width: 8px;
 }
 */
        width: 8px;
 }
 */

-

diff --git a/EarlyBlue/editor/skin/EditorDialog.css b/EarlyBlue/editor/skin/EditorDialog.css
index 75679904332cf63d2ad3144ec945e31e2a50dc7d..499e18048a2b01ab4a27af7f40da249303386f93 100755 (executable)
--- a/EarlyBlue/editor/skin/EditorDialog.css
+++ b/EarlyBlue/editor/skin/EditorDialog.css
@@ -1,255 +1,254 @@
-/* \r
- * The contents of this file are subject to the Netscape Public\r
- * License Version 1.1 (the "License"); you may not use this file\r
- * except in compliance with the License. You may obtain a copy of\r
- * the License at http://www.mozilla.org/NPL/\r
- *  \r
- * Software distributed under the License is distributed on an "AS\r
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or\r
- * implied. See the License for the specific language governing\r
- * rights and limitations under the License.\r
- *  \r
- * The Original Code is Mozilla Communicator client code, released\r
- * March 31, 1998.\r
- * \r
- * The Initial Developer of the Original Code is Netscape\r
- * Communications Corporation. Portions created by Netscape are\r
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All\r
- * Rights Reserved.\r
- * \r
- * Contributor(s): \r
- *   Pete Collins, Ben Goodger\r
- */\r
-\r
-/*\r
-   THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST HAVING YOUR\r
-   CHANGES REVIEWED BY cmanske@netscape.com.\r
-*/\r
-/* Most should be moved to global files */\r
-\r
-/* The defaults are WAY to big! */\r
-titledbox {\r
-  margin:         2px 5px; 4px; 5px;\r
-  padding-top:    2px;\r
-  padding-bottom: 4px;\r
-}\r
-\r
-.MinWidth5em {\r
-  min-width: 5em;\r
-}\r
-\r
-.MinWidth10em {\r
-  min-width: 10em;\r
-}\r
-\r
-.MinWidth20em {\r
-  min-width: 20em;\r
-}\r
-\r
-.big-left-margin {\r
-  margin-left:    10px;\r
-}\r
-\r
-.middle {\r
-  vertical-align: middle:\r
-}\r
-\r
-.bold {\r
-  font-weight: bold;\r
-}\r
-\r
-.italic {\r
-  font-style: italic;\r
-}\r
-\r
-.larger {\r
-  font-size: 120%;\r
-}\r
-\r
-\r
-.narrow {\r
-  width: 3em;\r
-}\r
-\r
-.align-right {\r
-  text-align: right;\r
-}\r
-\r
-.wrap {\r
- width: 1em;\r
-}\r
-/* end of "should be in global.css" */\r
-\r
-.color-well {\r
-  width:20px;\r
-  height: 1em; \r
-  border: 1px inset #CCD0DD;\r
-  /* Background color is set at runtime */\r
-}\r
-\r
-.color-well[default="true"] {\r
-  border: 1px solid transparent;\r
-  background-color: inherit;\r
-}\r
-\r
-.popup-trigger {\r
-  list-style-image: url(chrome://global/skin/scroll-down.gif);\r
-}\r
-\r
-/* temporary -- we need a simple box-based list defined in XBL */\r
-tree.list {\r
-  border: 1px inset #CCD0DD;\r
-  /* same as in menulist.css */\r
-  margin: 1px 5px 2px 5px;\r
-  width: 10em;\r
-  height: 3em;\r
-  /* use rows="#" in XUL to define height */\r
-}\r
-\r
-#ColorPreview {\r
-  border: 1px inset #CCD0DD;\r
-  margin-left:    10px;\r
-  padding-left:    5px;\r
-  padding-right:   5px;\r
-  min-width:     100px;\r
-  min-height:     50px;\r
-}\r
-\r
-#alignTypeSelect,label#alignLabel {\r
-  margin-left: 5px;\r
-}\r
-\r
-#MoreFewerButton[more="0"] {\r
-  list-style-image: url(chrome://global/skin/scroll-down.gif);\r
-  /* bug 9459 - changing button text doesn't resize width.\r
-     This covers that problem, but we want this size anyway */\r
-  min-width: 10em;\r
-}\r
-\r
-#MoreFewerButton[more="1"] {\r
-  list-style-image: url(chrome://global/skin/scroll-up.gif);\r
-  min-width: 10em;\r
-}\r
-\r
-#PreviousButton {\r
-  list-style-image: url(chrome://global/skin/arrow-left.gif);\r
-}\r
-\r
-#NextButton {\r
-  list-style-image: url(chrome://global/skin/arrow-right.gif);\r
-}\r
-\r
-#PreviousButton[type="row"] {\r
-  list-style-image: url(chrome://global/skin/arrow-up.gif);\r
-}\r
-\r
-#NextButton[type="row"] {\r
-  list-style-image: url(chrome://global/skin/arrow-down.gif);\r
-}\r
-\r
-#MisspelledWord {\r
-  font-weight: bold;\r
-}\r
-\r
-/* For a column of right-aligned text before \r
-   a column of input fields, e.g., InsertTable dialog\r
-*/\r
-.right {\r
-  /* doesn't work yet! must use align="right" in <text> */\r
-  text-align:   right;\r
-}\r
-\r
-/* use outset shape for a button look */\r
-.colorpicker {\r
-  border: 1px outset #CCD0DD;\r
-  /* This should be the same as for textfield */\r
-  margin-left: 4px;\r
-  /* For a little extra space between buttons */\r
-  margin-bottom: 2px;\r
-}\r
-\r
-\r
-.colorpicker:active {\r
-  border: 1px inset #CCD0DD;\r
-}\r
-\r
-/* THIS SHOULD BE IN GLOBAL.CSS */\r
-.smallspacer {\r
-  width:  3px;\r
-  height: 3px;\r
-  min-width:  3px;\r
-  min-height: 3px;\r
-}\r
-\r
-.spacer {\r
-  width:  5px;\r
-  height: 5px;\r
-  min-width:  5px;\r
-  min-height: 5px;\r
-}\r
-\r
-.bigspacer {\r
-  width:  10px;\r
-  height: 10px;\r
-  min-width:  10px;\r
-  min-height: 10px;\r
-}\r
-\r
-#img-align-top {\r
-       list-style-image:url("chrome://editor/skin/images/img-align-top.gif");\r
-}\r
-#img-align-middle {\r
-       list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");\r
-}\r
-#img-align-bottom {\r
-       list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");\r
-}\r
-#img-align-right {\r
-       list-style-image:url("chrome://editor/skin/images/img-align-right.gif");\r
-}\r
-#img-align-left {\r
-       list-style-image:url("chrome://editor/skin/images/img-align-left.gif");\r
-}\r
-\r
-/* Rest are from Ben Goodger for Advanced Edit dialog \r
-   These need reviewing and eliminate all but essential attributes */\r
-/* Have made some mods and eliminated some unnecessary portions. \r
-   hope to merge most of the treecell formatting into global as some of \r
-   this "property list" style treecell formatting is used by cookie/signon \r
-   viewers. */\r
-\r
-\r
-#tagLabel {\r
-  font-weight: bold;\r
-}\r
-\r
-/* styles for an attribute tree-table */\r
-tree.AttributesTree {\r
-  min-width : 200px;\r
-  min-height: 200px;\r
-}\r
-\r
-tree.AttributesTree > treechildren > treeitem > treerow > treecell.value {\r
-    padding-left    : 0px;\r
-    padding-top     : 0px;\r
-    padding-bottom  : 0px;\r
-    padding-right   : 0px;\r
-    margin-left     : 0px;\r
-}\r
-\r
-input.AttributesCell {\r
-  border: none;\r
-  width: 100%;\r
-  background-color: #FFFFFF;\r
-  font-weight: normal;\r
-  border: none;\r
-  outline: none;\r
-  margin: 0px;\r
-  width: 100%;\r
-}\r
-\r
-treecell > input {\r
-  margin: 0px;\r
-  background-color: #E5E5E5 ! important;\r
-}\r
-\r
+/* 
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Pete Collins, Ben Goodger
+ */
+
+/*
+   THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST HAVING YOUR
+   CHANGES REVIEWED BY cmanske@netscape.com.
+*/
+/* Most should be moved to global files */
+
+/* The defaults are WAY to big! */
+titledbox {
+  margin:         2px 5px; 4px; 5px;
+  padding-top:    2px;
+  padding-bottom: 4px;
+}
+
+.MinWidth5em {
+  min-width: 5em;
+}
+
+.MinWidth10em {
+  min-width: 10em;
+}
+
+.MinWidth20em {
+  min-width: 20em;
+}
+
+.big-left-margin {
+  margin-left:    10px;
+}
+
+.middle {
+  -moz-box-align: center:
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.italic {
+  font-style: italic;
+}
+
+.larger {
+  font-size: 120%;
+}
+
+
+.narrow {
+  width: 3em;
+}
+
+.align-right {
+  -moz-box-pack: end;
+}
+
+.wrap {
+ width: 1em;
+}
+/* end of "should be in global.css" */
+
+.color-well {
+  width:20px;
+  height: 1em; 
+  border: 1px inset #CCD0DD;
+  /* Background color is set at runtime */
+}
+
+.color-well[default="true"] {
+  border: 1px solid transparent;
+  background-color: inherit;
+}
+
+.popup-trigger {
+  list-style-image: url(chrome://global/skin/scroll-down.gif);
+}
+
+/* temporary -- we need a simple box-based list defined in XBL */
+tree.list {
+  border: 1px inset #CCD0DD;
+  /* same as in menulist.css */
+  margin: 1px 5px 2px 5px;
+  width: 10em;
+  height: 3em;
+  /* use rows="#" in XUL to define height */
+}
+
+#ColorPreview {
+  border: 1px inset #CCD0DD;
+  margin-left:    10px;
+  padding-left:    5px;
+  padding-right:   5px;
+  min-width:     100px;
+  min-height:     50px;
+}
+
+#alignTypeSelect,label#alignLabel {
+  margin-left: 5px;
+}
+
+#MoreFewerButton[more="0"] {
+  list-style-image: url(chrome://global/skin/scroll-down.gif);
+  /* bug 9459 - changing button text doesn't resize width.
+     This covers that problem, but we want this size anyway */
+  min-width: 10em;
+}
+
+#MoreFewerButton[more="1"] {
+  list-style-image: url(chrome://global/skin/scroll-up.gif);
+  min-width: 10em;
+}
+
+#PreviousButton {
+  list-style-image: url(chrome://global/skin/arrow-left.gif);
+}
+
+#NextButton {
+  list-style-image: url(chrome://global/skin/arrow-right.gif);
+}
+
+#PreviousButton[type="row"] {
+  list-style-image: url(chrome://global/skin/arrow-up.gif);
+}
+
+#NextButton[type="row"] {
+  list-style-image: url(chrome://global/skin/arrow-down.gif);
+}
+
+#MisspelledWord {
+  font-weight: bold;
+}
+
+/* For a column of right-aligned text before 
+   a column of input fields, e.g., InsertTable dialog
+*/
+.right {
+  /* doesn't work yet! must use align="right" in <text> */
+  text-align:   right;
+}
+
+/* use outset shape for a button look */
+.colorpicker {
+  border: 1px outset #CCD0DD;
+  /* This should be the same as for textfield */
+  margin-left: 4px;
+  /* For a little extra space between buttons */
+  margin-bottom: 2px;
+}
+
+
+.colorpicker:active {
+  border: 1px inset #CCD0DD;
+}
+
+/* THIS SHOULD BE IN GLOBAL.CSS */
+.smallspacer {
+  width:  3px;
+  height: 3px;
+  min-width:  3px;
+  min-height: 3px;
+}
+
+.spacer {
+  width:  5px;
+  height: 5px;
+  min-width:  5px;
+  min-height: 5px;
+}
+
+.bigspacer {
+  width:  10px;
+  height: 10px;
+  min-width:  10px;
+  min-height: 10px;
+}
+
+#img-align-top {
+       list-style-image:url("chrome://editor/skin/images/img-align-top.gif");
+}
+#img-align-middle {
+       list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");
+}
+#img-align-bottom {
+       list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");
+}
+#img-align-right {
+       list-style-image:url("chrome://editor/skin/images/img-align-right.gif");
+}
+#img-align-left {
+       list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
+}
+
+/* Rest are from Ben Goodger for Advanced Edit dialog 
+   These need reviewing and eliminate all but essential attributes */
+/* Have made some mods and eliminated some unnecessary portions. 
+   hope to merge most of the treecell formatting into global as some of 
+   this "property list" style treecell formatting is used by cookie/signon 
+   viewers. */
+
+
+#tagLabel {
+  font-weight: bold;
+}
+
+/* styles for an attribute tree-table */
+tree.AttributesTree {
+  min-width : 200px;
+  min-height: 200px;
+}
+
+tree.AttributesTree > treechildren > treeitem > treerow > treecell.value {
+    padding-left    : 0px;
+    padding-top     : 0px;
+    padding-bottom  : 0px;
+    padding-right   : 0px;
+    margin-left     : 0px;
+}
+
+input.AttributesCell {
+  border: none;
+  width: 100%;
+  background-color: #FFFFFF;
+  font-weight: normal;
+  border: none;
+  outline: none;
+  margin: 0px;
+  width: 100%;
+}
+
+treecell > input {
+  margin: 0px;
+  background-color: #E5E5E5 ! important;
+}

diff --git a/EarlyBlue/editor/skin/EditorToolbars.css b/EarlyBlue/editor/skin/EditorToolbars.css
index 3c5eecfe22cbb05965324df2f8f12bf79781ec43..2fa2337fdd211b5988476bf85f5269f2666a9831 100755 (executable)
--- a/EarlyBlue/editor/skin/EditorToolbars.css
+++ b/EarlyBlue/editor/skin/EditorToolbars.css
@@ -1,438 +1,438 @@
-/* \r
- * The contents of this file are subject to the Netscape Public\r
- * License Version 1.1 (the "License"); you may not use this file\r
- * except in compliance with the License. You may obtain a copy of\r
- * the License at http://www.mozilla.org/NPL/\r
- *  \r
- * Software distributed under the License is distributed on an "AS\r
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or\r
- * implied. See the License for the specific language governing\r
- * rights and limitations under the License.\r
- *  \r
- * The Original Code is Mozilla Communicator client code, released\r
- * March 31, 1998.\r
- * \r
- * The Initial Developer of the Original Code is Netscape\r
- * Communications Corporation. Portions created by Netscape are\r
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All\r
- * Rights Reserved.\r
- * \r
- * Contributor(s): \r
- */\r
-\r
-/* This contains CSS just for editor toolbars */\r
-\r
-#EditorToolbox {\r
-  min-width: 1px;\r
-}\r
-\r
-#FormatToolbar {\r
-  border-bottom: 1px solid #9999CC;\r
-}\r
-\r
-.separator_small { \r
-  width: 1em; \r
-}\r
-\r
-.margin-left-right {\r
-  margin-left:  3px;\r
-  margin-right: 3px;\r
-}\r
-\r
-/* From button.css: */\r
-/* margin: 4px 7px 1px 1px; */\r
-/* We have too many buttons - must be closer! */\r
-\r
-.toolbar, .key-toolbar {\r
-  margin-right: 2px;\r
-}\r
-\r
-.inset-border {\r
-  border: 1px inset CCCCDD;\r
-}\r
-\r
-/* THIS DOESN'T WORK ON <text>! */\r
-.center {\r
-  text-align: center;\r
-}\r
-\r
-/* end of SHOULD GO IN GLOBAL */\r
-\r
-#EditModeToolbar {\r
-  padding:       0px;\r
-  /* Same as "standard" toolbar background */\r
-  border-top:    1px solid #9999CC;\r
-  border-bottom: none;\r
-  margin-bottom: 0px;\r
-  min-width:     1px;\r
-  color:         #000000;\r
-  background-color: #CCD0DD;\r
-  overflow:      hidden;\r
-}\r
-/*\r
-#EditModeToolbar > toolbargrippy {\r
-  height: 100%;\r
-}\r
-*/\r
-/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */\r
-/* !important in for now as a workaround to above problem! */\r
-button.edit-mode:hover, button.edit-mode:hover:active,\r
-button.edit-mode {\r
-  -moz-border-radius: 0px 0px 7px 7px;\r
-  padding: 0px 4px 1px 4px;\r
-  margin: 0px;\r
-  color: #CCD0DD;\r
-  background-color: #666699;\r
-  border-top: 1px solid #666699 !important; /* Must be same as background */\r
-  border-bottom: 1px solid #9999CC !important;\r
-  border-left: 1px solid #9999CC !important;\r
-  border-right: 1px solid #9999CC !important;\r
-}\r
-\r
-button.edit-mode > .button-internal-box,\r
-button.edit-mode:hover > .button-internal-box,\r
-button.edit-mode:hover:active > .button-internal-box  {\r
-  border: none;\r
-}\r
-\r
-button.edit-mode:hover {\r
-  border:  1px solid #3366FF !important;\r
-}\r
-\r
-button.edit-mode:hover:active {\r
-  padding: 1px 5px 0px 3px;\r
-  border:  1px solid #99CCFF !important;\r
-}\r
-\r
-button.edit-mode[selected="1"] {\r
-  padding: 0px 4px 1px 4px;\r
-  margin: -1px 0px 0px 0px;\r
-/* Not resizing well! - use color instead\r
-  font-weight: bold; \r
-*/\r
-  background-color: #FFFFFF;\r
-  color: #000000;\r
-}\r
-\r
-button.edit-mode[selected="1"]:active,\r
-button.edit-mode[selected="1"]:hover:active {\r
-  padding: 1px 5px 0px 3px;\r
-}\r
-\r
-#NormalModeButton[type="image"] {\r
-  list-style-image:url(chrome://editor/skin/images/editmode-normal.gif); \r
-}\r
-\r
-#TagModeButton[type="image"] {\r
-  list-style-image:url(chrome://editor/skin/images/editmode-tags.gif); \r
-}\r
-#SourceModeButton[type="image"] {\r
-  list-style-image:url(chrome://editor/skin/images/editmode-html.gif); \r
-}\r
-#PreviewModeButton[type="image"] {\r
-  list-style-image:url(chrome://editor/skin/images/editmode-preview.gif); \r
-}\r
-#ToggleEditModeType {\r
-  list-style-image:url(chrome://editor/skin/images/editmode-toggle.gif); \r
-  border: 1px outset #CCD0DD;\r
-}\r
-\r
-#ToggleEditModeType:hover {\r
-  border: 1px solid #99CCFF;\r
-}\r
-\r
-#ToggleEditModeType:hover:active {\r
-  border: 1px inset #99CCFF;\r
-}\r
-\r
-/* Image URLs for all Editor toolbar buttons */\r
-\r
-#boldButton {\r
-  list-style-image:url(chrome://editor/skin/images/bold.gif); \r
-}\r
-\r
-#italicButton {\r
-  list-style-image:url(chrome://editor/skin/images/italic.gif); \r
-}\r
-\r
-#underlineButton {\r
-  list-style-image:url(chrome://editor/skin/images/underline.gif); \r
-}\r
-\r
-#newButton {\r
-       list-style-image:url("chrome://editor/skin/images/newfile.gif");\r
-}\r
-#newButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/newfile_dis.gif");\r
-}\r
-\r
-#openButton {\r
-       list-style-image:url("chrome://editor/skin/images/openfile.gif");\r
-}\r
-#openButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/openfile_dis.gif");\r
-}\r
-\r
-#saveButton {\r
-       list-style-image:url("chrome://editor/skin/images/savefile.gif");\r
-}\r
-#saveButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/savefile_dis.gif");\r
-}\r
-#saveButton[dirty="true"] {\r
-  list-style-image:url(chrome://editor/skin/images/savemod.gif); \r
-}\r
-\r
-#publishButton {\r
-       list-style-image:url("chrome://editor/skin/images/publish.gif");\r
-}\r
-\r
-#previewButton {\r
-       list-style-image:url("chrome://editor/skin/images/preview.gif");\r
-}\r
-#previewButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/preview_dis.gif");\r
-}\r
-\r
-#printButton \r
-  {\r
-         list-style-image      : url("chrome://editor/skin/images/print.gif");\r
-  }\r
-#printButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/print_dis.gif");\r
-}\r
-\r
-#findButton {\r
-       list-style-image:url("chrome://editor/skin/images/find.gif");\r
-}\r
-#findButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/find_dis.gif");\r
-}\r
-\r
-#linkButton {\r
-       list-style-image:url("chrome://editor/skin/images/link.gif");\r
-}\r
-#linkButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/link_dis.gif");\r
-}\r
-\r
-#imageButton {\r
-       list-style-image:url("chrome://editor/skin/images/image.gif");\r
-}\r
-#imageButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/image_dis.gif");\r
-}\r
-\r
-#namedAnchorButton {\r
-       list-style-image:url("chrome://editor/skin/images/anchor.gif");\r
-}\r
-#namedAnchorButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/anchor_dis.gif");\r
-}\r
-\r
-#hlineButton {\r
-       list-style-image:url("chrome://editor/skin/images/hline.gif");\r
-}\r
-#hlineButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/hline_dis.gif");\r
-}\r
-\r
-#tableButton {\r
-       list-style-image:url("chrome://editor/skin/images/table.gif");\r
-}\r
-#tableButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/table_dis.gif");\r
-}\r
-\r
-#linkButton-dark {\r
-       list-style-image:url("chrome://editor/skin/images/link.gif");\r
-}\r
-#imageButton-dark {\r
-       list-style-image:url("chrome://editor/skin/images/image.gif");\r
-}\r
-#namedAnchorButton-dark {\r
-       list-style-image:url("chrome://editor/skin/images/anchor.gif");\r
-}\r
-#hlineButton-dark {\r
-       list-style-image:url("chrome://editor/skin/images/hline.gif");\r
-}\r
-#tableButton-dark {\r
-       list-style-image:url("chrome://editor/skin/images/table.gif");\r
-}\r
-#spellingButton {\r
-       list-style-image:url("chrome://editor/skin/images/spell.gif");\r
-}\r
-\r
-#DecreaseFontSizeButton {\r
-       list-style-image:url("chrome://editor/skin/images/dec-font-size.gif");\r
-}\r
-\r
-#IncreaseFontSizeButton {\r
-       list-style-image:url("chrome://editor/skin/images/inc-font-size.gif");\r
-}\r
-\r
-#ulButton {\r
-       list-style-image:url("chrome://editor/skin/images/bullets.gif");\r
-}\r
-#olButton {\r
-       list-style-image:url("chrome://editor/skin/images/numbers.gif");\r
-}\r
-#outdentButton {\r
-       list-style-image:url("chrome://editor/skin/images/outdent.gif");\r
-}\r
-#outdentButton[disabled="true"] {\r
-       list-style-image:url("chrome://editor/skin/images/outdent_dis.gif");\r
-}\r
-\r
-#indentButton {\r
-       list-style-image:url("chrome://editor/skin/images/indent.gif");\r
-}\r
-\r
-#FormatToolbar > button,\r
-#FormatToolbar > button:hover,\r
-#FormatToolbar > button:active,\r
-#FormatToolbar > button[disabled="true"] {\r
-        margin: 0px 3px 0px 0px;\r
-        border: none;\r
-        min-width: 23px;\r
-        min-height: 23px;\r
-}\r
-#FormatToolbar > button > .button-internal-box {\r
-        margin: 0px;\r
-        padding: 1px;\r
-        border: 1px solid transparent;\r
-        text-align: center;\r
-}\r
-#FormatToolbar > button:hover > .button-internal-box {\r
-        border: 1px outset #CCD0DD;\r
-}\r
-#FormatToolbar > button:active > .button-internal-box {\r
-        padding: 2px 0px 0px 2px;\r
-        border: 1px inset #CCD0DD;\r
-}\r
-#FormatToolbar > button[disabled="true"] > .button-internal-box {\r
-        border: 1px solid transparent;\r
-}\r
-\r
-#FormatToolbar > button > .button-internal-box > .button-text-container\r
-  {\r
-    display               : none;\r
-  } \r
-\r
-#ParagraphSelect {\r
-        margin-top: 2px;\r
-}\r
-\r
-#AlignPopupButton {\r
-       list-style-image:url("chrome://editor/skin/images/align.gif");\r
-}\r
-\r
-#AlignPopupButton > .button-internal-box {\r
-       border:1px solid transparent;\r
-}\r
-#AlignPopupButton:hover > .button-internal-box {\r
-       border:1px outset #CCD0DD;\r
-}\r
-#AlignPopupButton:active > .button-internal-box,\r
-#AlignPopupButton[open="true"] > .button-internal-box {\r
-       border:1px inset #CCD0DD;\r
-}\r
-\r
-#InsertPopupButton {\r
-       list-style-image:url("chrome://editor/skin/images/object-popup.gif");\r
-}\r
-\r
-#text-align-left,\r
-#align-left-button\r
-  {\r
-         list-style-image      : url("chrome://editor/skin/images/left.gif");\r
-  } \r
-\r
-#text-align-left[disabled="true"],\r
-#text-align-left[disabled="true"]:hover,\r
-#text-align-left[disabled="true"]:hover:active,\r
-#align-left-button[disabled="true"],\r
-#align-left-button[disabled="true"]:hover,\r
-#align-left-button[disabled="true"]:hover:active,\r
-  {\r
-    list-style-image      : url("chrome://editor/skin/images/left-disabled.gif");\r
-  } \r
-\r
-#text-align-center,\r
-#align-center-button\r
-  {\r
-         list-style-image      : url("chrome://editor/skin/images/center.gif");\r
-  } \r
-\r
-#text-align-center[disabled="true"],\r
-#text-align-center[disabled="true"]:hover,\r
-#text-align-center[disabled="true"]:hover:active,\r
-#align-center-button[disabled="true"],\r
-#align-center-button[disabled="true"]:hover,\r
-#align-center-button[disabled="true"]:hover:active\r
-  {\r
-    list-style-image      : url("chrome://editor/skin/images/center-disabled.gif");\r
-  } \r
-\r
-#text-align-right,\r
-#align-right-button\r
-  {\r
-         list-style-image      : url("chrome://editor/skin/images/right.gif");\r
-  } \r
-\r
-#text-align-right[disabled="true"],\r
-#text-align-right[disabled="true"]:hover,\r
-#text-align-right[disabled="true"]:hover:active\r
-#align-right-button[disabled="true"],\r
-#align-right-button[disabled="true"]:hover,\r
-#align-right-button[disabled="true"]:hover:active \r
- {\r
-    list-style-image      : url("chrome://editor/skin/images/right-disabled.gif");\r
-  } \r
-\r
-#text-align-justify, #align-justify-button\r
-  {\r
-         list-style-image      : url("chrome://editor/skin/images/justify.gif");\r
-  }\r
-\r
-#text-align-justify[disabled="true"],\r
-#text-align-justify[disabled="true"]:hover,\r
-#text-align-justify[disabled="true"]:hover:active\r
-#align-justify-button[disabled="true"],\r
-#align-justify-button[disabled="true"]:hover,\r
-#align-justify-button[disabled="true"]:hover:active \r
- {\r
-    list-style-image      : url("chrome://editor/skin/images/justify-disabled.gif");\r
-  } \r
-\r
-.ColorPickerLabel {\r
-  border:     1px inset white;\r
-  margin:     0px;\r
-  padding:    2px;\r
-  text-align: center;\r
-}\r
-\r
-/* TODO: How to make inset color skinable? */\r
-.color-button {\r
-  border: 1px inset #CCD0DD;\r
-  padding: 0px;\r
-  width:  19px;\r
-  height: 19px;\r
-  margin:  1px;\r
-}\r
-\r
-.color-button:hover {\r
-  border:  1px solid #666699;\r
-}\r
-\r
-#TextColorPopupButton {\r
-  margin: 2px 9px 9px 2px;\r
-  /* TEMP: Set color here. TODO: Set color from page */\r
-  background-color: #AA0000;\r
-}\r
-\r
-#BackColorPopupButton {\r
-  margin: 9px 2px 2px 9px;\r
-  /* TEMP: Set color here. TODO: Set color from page */\r
-  background-color: #FFFF00;\r
-}\r
+/* 
+ * 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 Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ */
+
+/* This contains CSS just for editor toolbars */
+
+#EditorToolbox {
+  min-width: 1px;
+}
+
+#FormatToolbar {
+  border-bottom: 1px solid #9999CC;
+}
+
+.separator_small { 
+  width: 1em; 
+}
+
+.margin-left-right {
+  margin-left:  3px;
+  margin-right: 3px;
+}
+
+/* From button.css: */
+/* margin: 4px 7px 1px 1px; */
+/* We have too many buttons - must be closer! */
+
+.toolbar, .key-toolbar {
+  margin-right: 2px;
+}
+
+.inset-border {
+  border: 1px inset CCCCDD;
+}
+
+/* THIS DOESN'T WORK ON <text>! */
+.center {
+  text-align: center;
+}
+
+/* end of SHOULD GO IN GLOBAL */
+
+#EditModeToolbar {
+  padding:       0px;
+  /* Same as "standard" toolbar background */
+  border-top:    1px solid #9999CC;
+  border-bottom: none;
+  margin-bottom: 0px;
+  min-width:     1px;
+  color:         #000000;
+  background-color: #CCD0DD;
+  overflow:      hidden;
+}
+/*
+#EditModeToolbar > toolbargrippy {
+  height: 100%;
+}
+*/
+/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */
+/* !important in for now as a workaround to above problem! */
+button.edit-mode:hover, button.edit-mode:hover:active,
+button.edit-mode {
+  -moz-border-radius: 0px 0px 7px 7px;
+  padding: 0px 4px 1px 4px;
+  margin: 0px;
+  color: #CCD0DD;
+  background-color: #666699;
+  border-top: 1px solid #666699 !important; /* Must be same as background */
+  border-bottom: 1px solid #9999CC !important;
+  border-left: 1px solid #9999CC !important;
+  border-right: 1px solid #9999CC !important;
+}
+
+button.edit-mode > .button-internal-box,
+button.edit-mode:hover > .button-internal-box,
+button.edit-mode:hover:active > .button-internal-box  {
+  border: none;
+}
+
+button.edit-mode:hover {
+  border:  1px solid #3366FF !important;
+}
+
+button.edit-mode:hover:active {
+  padding: 1px 5px 0px 3px;
+  border:  1px solid #99CCFF !important;
+}
+
+button.edit-mode[selected="1"] {
+  padding: 0px 4px 1px 4px;
+  margin: -1px 0px 0px 0px;
+/* Not resizing well! - use color instead
+  font-weight: bold; 
+*/
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+button.edit-mode[selected="1"]:active,
+button.edit-mode[selected="1"]:hover:active {
+  padding: 1px 5px 0px 3px;
+}
+
+#NormalModeButton[type="image"] {
+  list-style-image:url(chrome://editor/skin/images/editmode-normal.gif); 
+}
+
+#TagModeButton[type="image"] {
+  list-style-image:url(chrome://editor/skin/images/editmode-tags.gif); 
+}
+#SourceModeButton[type="image"] {
+  list-style-image:url(chrome://editor/skin/images/editmode-html.gif); 
+}
+#PreviewModeButton[type="image"] {
+  list-style-image:url(chrome://editor/skin/images/editmode-preview.gif); 
+}
+#ToggleEditModeType {
+  list-style-image:url(chrome://editor/skin/images/editmode-toggle.gif); 
+  border: 1px outset #CCD0DD;
+}
+
+#ToggleEditModeType:hover {
+  border: 1px solid #99CCFF;
+}
+
+#ToggleEditModeType:hover:active {
+  border: 1px inset #99CCFF;
+}
+
+/* Image URLs for all Editor toolbar buttons */
+
+#boldButton {
+  list-style-image:url(chrome://editor/skin/images/bold.gif); 
+}
+
+#italicButton {
+  list-style-image:url(chrome://editor/skin/images/italic.gif); 
+}
+
+#underlineButton {
+  list-style-image:url(chrome://editor/skin/images/underline.gif); 
+}
+
+#newButton {
+       list-style-image:url("chrome://editor/skin/images/newfile.gif");
+}
+#newButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/newfile_dis.gif");
+}
+
+#openButton {
+       list-style-image:url("chrome://editor/skin/images/openfile.gif");
+}
+#openButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/openfile_dis.gif");
+}
+
+#saveButton {
+       list-style-image:url("chrome://editor/skin/images/savefile.gif");
+}
+#saveButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/savefile_dis.gif");
+}
+#saveButton[dirty="true"] {
+  list-style-image:url(chrome://editor/skin/images/savemod.gif); 
+}
+
+#publishButton {
+       list-style-image:url("chrome://editor/skin/images/publish.gif");
+}
+
+#previewButton {
+       list-style-image:url("chrome://editor/skin/images/preview.gif");
+}
+#previewButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/preview_dis.gif");
+}
+
+#printButton 
+  {
+         list-style-image      : url("chrome://editor/skin/images/print.gif");
+  }
+#printButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/print_dis.gif");
+}
+
+#findButton {
+       list-style-image:url("chrome://editor/skin/images/find.gif");
+}
+#findButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/find_dis.gif");
+}
+
+#linkButton {
+       list-style-image:url("chrome://editor/skin/images/link.gif");
+}
+#linkButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/link_dis.gif");
+}
+
+#imageButton {
+       list-style-image:url("chrome://editor/skin/images/image.gif");
+}
+#imageButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/image_dis.gif");
+}
+
+#namedAnchorButton {
+       list-style-image:url("chrome://editor/skin/images/anchor.gif");
+}
+#namedAnchorButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/anchor_dis.gif");
+}
+
+#hlineButton {
+       list-style-image:url("chrome://editor/skin/images/hline.gif");
+}
+#hlineButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/hline_dis.gif");
+}
+
+#tableButton {
+       list-style-image:url("chrome://editor/skin/images/table.gif");
+}
+#tableButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/table_dis.gif");
+}
+
+#linkButton-dark {
+       list-style-image:url("chrome://editor/skin/images/link.gif");
+}
+#imageButton-dark {
+       list-style-image:url("chrome://editor/skin/images/image.gif");
+}
+#namedAnchorButton-dark {
+       list-style-image:url("chrome://editor/skin/images/anchor.gif");
+}
+#hlineButton-dark {
+       list-style-image:url("chrome://editor/skin/images/hline.gif");
+}
+#tableButton-dark {
+       list-style-image:url("chrome://editor/skin/images/table.gif");
+}
+#spellingButton {
+       list-style-image:url("chrome://editor/skin/images/spell.gif");
+}
+
+#DecreaseFontSizeButton {
+       list-style-image:url("chrome://editor/skin/images/dec-font-size.gif");
+}
+
+#IncreaseFontSizeButton {
+       list-style-image:url("chrome://editor/skin/images/inc-font-size.gif");
+}
+
+#ulButton {
+       list-style-image:url("chrome://editor/skin/images/bullets.gif");
+}
+#olButton {
+       list-style-image:url("chrome://editor/skin/images/numbers.gif");
+}
+#outdentButton {
+       list-style-image:url("chrome://editor/skin/images/outdent.gif");
+}
+#outdentButton[disabled="true"] {
+       list-style-image:url("chrome://editor/skin/images/outdent_dis.gif");
+}
+
+#indentButton {
+       list-style-image:url("chrome://editor/skin/images/indent.gif");
+}
+
+#FormatToolbar > button,
+#FormatToolbar > button:hover,
+#FormatToolbar > button:active,
+#FormatToolbar > button[disabled="true"] {
+        margin: 0px 3px 0px 0px;
+        border: none;
+        min-width: 23px;
+        min-height: 23px;
+}
+#FormatToolbar > button > .button-internal-box {
+        margin: 0px;
+        padding: 1px;
+        border: 1px solid transparent;
+        -moz-box-pack: center;
+}
+#FormatToolbar > button:hover > .button-internal-box {
+        border: 1px outset #CCD0DD;
+}
+#FormatToolbar > button:active > .button-internal-box {
+        padding: 2px 0px 0px 2px;
+        border: 1px inset #CCD0DD;
+}
+#FormatToolbar > button[disabled="true"] > .button-internal-box {
+        border: 1px solid transparent;
+}
+
+#FormatToolbar > button > .button-internal-box > .button-text-container
+  {
+    display               : none;
+  } 
+
+#ParagraphSelect {
+        margin-top: 2px;
+}
+
+#AlignPopupButton {
+       list-style-image:url("chrome://editor/skin/images/align.gif");
+}
+
+#AlignPopupButton > .button-internal-box {
+       border:1px solid transparent;
+}
+#AlignPopupButton:hover > .button-internal-box {
+       border:1px outset #CCD0DD;
+}
+#AlignPopupButton:active > .button-internal-box,
+#AlignPopupButton[open="true"] > .button-internal-box {
+       border:1px inset #CCD0DD;
+}
+
+#InsertPopupButton {
+       list-style-image:url("chrome://editor/skin/images/object-popup.gif");
+}
+
+#text-align-left,
+#align-left-button
+  {
+         list-style-image      : url("chrome://editor/skin/images/left.gif");
+  } 
+
+#text-align-left[disabled="true"],
+#text-align-left[disabled="true"]:hover,
+#text-align-left[disabled="true"]:hover:active,
+#align-left-button[disabled="true"],
+#align-left-button[disabled="true"]:hover,
+#align-left-button[disabled="true"]:hover:active,
+  {
+    list-style-image      : url("chrome://editor/skin/images/left-disabled.gif");
+  } 
+
+#text-align-center,
+#align-center-button
+  {
+         list-style-image      : url("chrome://editor/skin/images/center.gif");
+  } 
+
+#text-align-center[disabled="true"],
+#text-align-center[disabled="true"]:hover,
+#text-align-center[disabled="true"]:hover:active,
+#align-center-button[disabled="true"],
+#align-center-button[disabled="true"]:hover,
+#align-center-button[disabled="true"]:hover:active
+  {
+    list-style-image      : url("chrome://editor/skin/images/center-disabled.gif");
+  } 
+
+#text-align-right,
+#align-right-button
+  {
+         list-style-image      : url("chrome://editor/skin/images/right.gif");
+  } 
+
+#text-align-right[disabled="true"],
+#text-align-right[disabled="true"]:hover,
+#text-align-right[disabled="true"]:hover:active
+#align-right-button[disabled="true"],
+#align-right-button[disabled="true"]:hover,
+#align-right-button[disabled="true"]:hover:active 
+ {
+    list-style-image      : url("chrome://editor/skin/images/right-disabled.gif");
+  } 
+
+#text-align-justify, #align-justify-button
+  {
+         list-style-image      : url("chrome://editor/skin/images/justify.gif");
+  }
+
+#text-align-justify[disabled="true"],
+#text-align-justify[disabled="true"]:hover,
+#text-align-justify[disabled="true"]:hover:active
+#align-justify-button[disabled="true"],
+#align-justify-button[disabled="true"]:hover,
+#align-justify-button[disabled="true"]:hover:active 
+ {
+    list-style-image      : url("chrome://editor/skin/images/justify-disabled.gif");
+  } 
+
+.ColorPickerLabel {
+  border:     1px inset white;
+  margin:     0px;
+  padding:    2px;
+  -moz-box-pack: center;
+}
+
+/* TODO: How to make inset color skinable? */
+.color-button {
+  border: 1px inset #CCD0DD;
+  padding: 0px;
+  width:  19px;
+  height: 19px;
+  margin:  1px;
+}
+
+.color-button:hover {
+  border:  1px solid #666699;
+}
+
+#TextColorPopupButton {
+  margin: 2px 9px 9px 2px;
+  /* TEMP: Set color here. TODO: Set color from page */
+  background-color: #AA0000;
+}
+
+#BackColorPopupButton {
+  margin: 9px 2px 2px 9px;
+  /* TEMP: Set color here. TODO: Set color from page */
+  background-color: #FFFF00;
+}

diff --git a/EarlyBlue/global/skin/button.css b/EarlyBlue/global/skin/button.css
index 6ff34999712dc0000ea943b6b6865fb9ee50ba20..037c93453a072a9af3d1e6f3a872c9eadb6df3a8 100755 (executable)
--- a/EarlyBlue/global/skin/button.css
+++ b/EarlyBlue/global/skin/button.css
@@ -23,8 +23,8 @@
 /* internal frame */
   button > .button-internal-box 
     {
 /* internal frame */
   button > .button-internal-box 
     {

-      vertical-align      : middle;
-      text-align          : center;
+      -moz-box-align      : center;
+      -moz-box-pack       : center;

       border              : 1px outset #CCD0DD;
       padding             : 1px;
     }
       border              : 1px outset #CCD0DD;
       padding             : 1px;
     }


@@ -46,8 +46,8 @@
 /* text wrapping frame (hack because <text> does not support alignment) */
   .button-text-container
     {
 /* text wrapping frame (hack because <text> does not support alignment) */
   .button-text-container
     {

-      text-align          : center;
-      vertical-align      : middle;
+      -moz-box-align      : center;
+      -moz-box-pack       : center;

     }
 
 /* text frame */
     }
 
 /* text frame */


@@ -154,3 +154,4 @@
     
     
 
     
     
 

+

diff --git a/EarlyBlue/global/skin/classicBindings.xml b/EarlyBlue/global/skin/classicBindings.xml
index 68cf3a15883cbe2e0a9625aff24d1c3c0ce891b5..1cd8a1008eb5b9b6c84176e5564959d9dd506c25 100755 (executable)
--- a/EarlyBlue/global/skin/classicBindings.xml
+++ b/EarlyBlue/global/skin/classicBindings.xml
@@ -15,18 +15,18 @@
 
   <binding id="toolbargrippy" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content orient="vertical">
 
   <binding id="toolbargrippy" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content orient="vertical">

-      <xul:box autostretch="never" halign="center">
+      <xul:vbox autostretch="never" align="center">

         <xul:image class="toolbargrippy-twisty"/>
         <xul:image class="toolbargrippy-twisty"/>

-      </xul:box>
+      </xul:vbox>

       <xul:spring class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
   
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
       <xul:spring class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
   
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>

-      <xul:box autostretch="never" halign="center">
+      <xul:hbox autostretch="never" align="center">

         <xul:image class="toolbargrippy-twisty-collapsed"/>
         <xul:image class="toolbargrippy-twisty-collapsed"/>

-      </xul:box>
+      </xul:hbox>

       <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>
       <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>


@@ -34,7 +34,7 @@
 
   <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
     <content excludes="observes">
 
   <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
     <content excludes="observes">

-      <xul:box flex="1" class="radio-internal-box" autostretch="never" valign="middle">
+      <xul:box flex="1" class="radio-internal-box" autostretch="never" align="center">

         <xul:box class="radio-checkmark-box-1" autostretch="never" inherits="disabled">
           <xul:box class="radio-checkmark-box-2" autostretch="never" flex="1">
             <xul:image class="radio-check" inherits="checked,disabled"/>
         <xul:box class="radio-checkmark-box-1" autostretch="never" inherits="disabled">
           <xul:box class="radio-checkmark-box-2" autostretch="never" flex="1">
             <xul:image class="radio-check" inherits="checked,disabled"/>


@@ -50,7 +50,7 @@
 
   <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox">
     <content excludes="observes">
 
   <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox">
     <content excludes="observes">

-      <xul:box flex="1" class="checkbox-internal-box" autostretch="never" valign="middle">
+      <xul:box flex="1" class="checkbox-internal-box" autostretch="never" align="center">

         <xul:box class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">
           <xul:box class="checkbox-checkmark-box-2" autostretch="never" flex="1">
             <xul:image class="checkbox-check" inherits="checked,disabled"/>
         <xul:box class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">
           <xul:box class="checkbox-checkmark-box-2" autostretch="never" flex="1">
             <xul:image class="checkbox-check" inherits="checked,disabled"/>


@@ -74,11 +74,11 @@
 
   <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
     <content>
 
   <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
     <content>

-      <xul:scrollbarbutton type="decrement" inherits="align:sborient"/>
+      <xul:scrollbarbutton type="decrement" inherits="sborient=orient"/>

       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
              <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
              <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>

-      <xul:scrollbarbutton type="increment" inherits="align:sborient"/>
+      <xul:scrollbarbutton type="increment" inherits="sborient=orient"/>

     </content>
   </binding>
   
     </content>
   </binding>
   


@@ -113,6 +113,3 @@
   </binding>
   
 </bindings>
   </binding>
   
 </bindings>

-
-
-

diff --git a/EarlyBlue/global/skin/dialogOverlay.css b/EarlyBlue/global/skin/dialogOverlay.css
index 04ff937cc5b5ec02c44b0792f0cf8b127525e40d..bb5277125e0b27c5947373526feb5e61aa3659e3 100755 (executable)
--- a/EarlyBlue/global/skin/dialogOverlay.css
+++ b/EarlyBlue/global/skin/dialogOverlay.css
@@ -1,116 +1,114 @@
-/**  \r
- * Small Dialog Header (without icon)\r
- **/\r
-.box-smallheader \r
-  {\r
-    -moz-binding          : url(chrome://global/content/dialogBindings.xml#smallheader);\r
-    border                : 1px inset #CCD0DD;\r
-    margin                : 0px 5px 6px 5px;\r
-  }\r
-\r
-.toolbar-primary\r
-  {\r
-    padding               : 0px 0px 3px 0px;\r
-    min-height            : 0px;\r
-  }\r
-\r
-.box-smallheader-left \r
-  {\r
-    font-size             : larger;\r
-    font-weight           : bold;\r
-    padding-left          : 6px;\r
-  }\r
-\r
-.box-smallheader-right \r
-  {\r
-    padding-right         : 6px;\r
-  }\r
-\r
-.box-smallheader > .toolbar-primary \r
-  {\r
-    border                : 1px solid threeddarkshadow;\r
-    vertical-align        : middle;\r
-    padding-top           : 3px;\r
-  }\r
-\r
-/** \r
- * Large Dialog Header (with icon) \r
- **/\r
-.box-header \r
-  {\r
-    -moz-binding          : url(chrome://global/content/dialogBindings.xml#largeheader);\r
-  }\r
-\r
-.box-header-header \r
-  {\r
-    padding               : 0px 0px 4px 5px;\r
-    min-height            : 34px;\r
-  }\r
-\r
-.box-header-text-box \r
-  {\r
-    vertical-align        : middle;\r
-  }\r
-\r
-.box-header-text \r
-  {\r
-    color                 : white;\r
-    font-size             : large;\r
-    font-weight           : bold;\r
-    text-decoration       : underline;\r
-  }\r
-\r
-.box-header-icon-box  \r
-  {\r
-    vertical-align        : middle;\r
-  }\r
-  \r
-.box-header-circle \r
-  {\r
-       background-color      : transparent;\r
-         min-width             : 28px;\r
-       margin                : 1px 7px 1px 1px;\r
-    height                : 28px;\r
-    width                 : 28px;\r
-  }  \r
-\r
-/**\r
- * Dialog status line (blue) including progress area\r
- **/\r
-.box-status \r
-  {\r
-    -moz-binding          : url(chrome://global/content/dialogBindings.xml#status);\r
-  }\r
-\r
-.box-status-bg \r
-  {\r
-    padding               : 1px 5px 1px 5px;\r
-    min-height            : 0px ! important;\r
-  }\r
-\r
-.box-status-text, .box-status-progress\r
-  {\r
-    color                 : #99cccc ! important;\r
-  }\r
-\r
-  \r
-/** \r
- * Utility classes for use when combined headers/footers are used\r
- **/\r
-/* display area framed container */\r
-#contentarea \r
-  {\r
-    border-top            : 2px groove threedface;\r
-    border-bottom         : 2px groove threedface;\r
-    padding               : 7px;\r
-  }\r
-\r
-/* top border on status area */\r
-#wizardButtons \r
-  {\r
-    border-bottom         : 1px solid threedshadow;\r
-    padding-top           : 1px;\r
-    padding-bottom        : 1px;\r
-  }\r
-\r
-\r
+/**  
+ * Small Dialog Header (without icon)
+ **/
+.box-smallheader 
+  {
+    -moz-binding          : url(chrome://global/content/dialogBindings.xml#smallheader);
+    border                : 1px inset #CCD0DD;
+    margin                : 0px 5px 6px 5px;
+  }
+
+.toolbar-primary
+  {
+    padding               : 0px 0px 3px 0px;
+    min-height            : 0px;
+  }
+
+.box-smallheader-left 
+  {
+    font-size             : larger;
+    font-weight           : bold;
+    padding-left          : 6px;
+  }
+
+.box-smallheader-right 
+  {
+    padding-right         : 6px;
+  }
+
+.box-smallheader > .toolbar-primary 
+  {
+    border                : 1px solid threeddarkshadow;
+    -moz-box-align        : center;
+    padding-top           : 3px;
+  }
+
+/** 
+ * Large Dialog Header (with icon) 
+ **/
+.box-header 
+  {
+    -moz-binding          : url(chrome://global/content/dialogBindings.xml#largeheader);
+  }
+
+.box-header-header 
+  {
+    padding               : 0px 0px 4px 5px;
+    min-height            : 34px;
+  }
+
+.box-header-text-box 
+  {
+    -moz-box-align        : center;
+  }
+
+.box-header-text 
+  {
+    color                 : white;
+    font-size             : large;
+    font-weight           : bold;
+    text-decoration       : underline;
+  }
+
+.box-header-icon-box  
+  {
+    -moz-box-align        : center;
+  }
+  
+.box-header-circle 
+  {
+    background-color      : transparent;
+    min-width             : 28px;
+    margin                : 1px 7px 1px 1px;
+    height                : 28px;
+    width                 : 28px;
+  }  
+
+/**
+ * Dialog status line (blue) including progress area
+ **/
+.box-status 
+  {
+    -moz-binding          : url(chrome://global/content/dialogBindings.xml#status);
+  }
+
+.box-status-bg 
+  {
+    padding               : 1px 5px 1px 5px;
+    min-height            : 0px ! important;
+  }
+
+.box-status-text, .box-status-progress
+  {
+    color                 : #99cccc ! important;
+  }
+
+  
+/** 
+ * Utility classes for use when combined headers/footers are used
+ **/
+/* display area framed container */
+#contentarea 
+  {
+    border-top            : 2px groove threedface;
+    border-bottom         : 2px groove threedface;
+    padding               : 7px;
+  }
+
+/* top border on status area */
+#wizardButtons 
+  {
+    border-bottom         : 1px solid threedshadow;
+    padding-top           : 1px;
+    padding-bottom        : 1px;
+  }

diff --git a/EarlyBlue/global/skin/global.css b/EarlyBlue/global/skin/global.css
index 4cc305592692af2495df904dee7a7721ead898de..ab5e54c8a3cee90d4a9e7a259bb362968e65b9c6 100755 (executable)
--- a/EarlyBlue/global/skin/global.css
+++ b/EarlyBlue/global/skin/global.css
@@ -144,12 +144,13 @@
       color               : #CCD0DD;
       user-focus          : ignore;
       overflow            : hidden
       color               : #CCD0DD;
       user-focus          : ignore;
       overflow            : hidden

+      -moz-box-align      : center;

     }
 
   statusbarpanel, .statusbar-panel
     {
       padding             : 0px 1px 0px 1px;
     }
 
   statusbarpanel, .statusbar-panel
     {
       padding             : 0px 1px 0px 1px;

-      vertical-align      : middle;
+      -moz-box-align      : center;

     }
 
   .statusbarpanel-icononly
     }
 
   .statusbarpanel-icononly


@@ -180,11 +181,3 @@
   {
     margin                : 0px;
   }
   {
     margin                : 0px;
   }

-  
-  
-
-
-
-
-
-

diff --git a/EarlyBlue/global/skin/menu.css b/EarlyBlue/global/skin/menu.css
index 8ac95cb56d9650a39f06fd2c4948903fc5b772a7..c6dff932ffeae276422e022624e11f1a50439dc6 100755 (executable)
--- a/EarlyBlue/global/skin/menu.css
+++ b/EarlyBlue/global/skin/menu.css
@@ -1,7 +1,7 @@
 menu, menuitem  
   {
     color                 : #000000;
 menu, menuitem  
   {
     color                 : #000000;

-    vertical-align        : middle;
+    -moz-box-align        : center;

   }
 
 menuitem[default="true"]
   }
 
 menuitem[default="true"]


@@ -64,7 +64,7 @@ popup > menuitem[menuactive="true"]
   {
     margin                : 0px 0px 0px 6px;
     width                 : 8px;
   {
     margin                : 0px 0px 0px 6px;
     width                 : 8px;

-    text-align            : center;
+    -moz-box-pack         : center;

     list-style-image      : url("chrome://global/skin/menu-arrow.gif");
   }
 
     list-style-image      : url("chrome://global/skin/menu-arrow.gif");
   }
 


@@ -73,7 +73,7 @@ popup > menuitem[menuactive="true"]
     color                 : inherit;
     margin                : 0px 4px 0px 3px;
     width                 : 16px;
     color                 : inherit;
     margin                : 0px 4px 0px 3px;
     width                 : 16px;

-    text-align            : center;
+    -moz-box-pack         : center;

     list-style-image      : inherit;
   }
 
     list-style-image      : inherit;
   }
 


@@ -202,6 +202,3 @@ menuitem[checked="true"][type="radio"][menuactive="true"]
       width               : 0px;
       border              : none;
     }
       width               : 0px;
       border              : none;
     }

-
-
-

diff --git a/EarlyBlue/global/skin/menubutton.css b/EarlyBlue/global/skin/menubutton.css
index ccbca60651fe6e364403303d3e7c7d6583e518ad..f2b5953382fc4a97ffc5a95a9cf8b7fb73cec4c3 100755 (executable)
--- a/EarlyBlue/global/skin/menubutton.css
+++ b/EarlyBlue/global/skin/menubutton.css
@@ -14,7 +14,7 @@
     {
       border              : none;
       padding             : 0px;
     {
       border              : none;
       padding             : 0px;

-      vertical-align      : middle;
+      -moz-box-align      : center;

     }
 
   .menubutton-single-icon
     }
 
   .menubutton-single-icon


@@ -124,7 +124,4 @@
     {
       border              : 1px inset #CCD0DD;
       padding             : 2px 0px 0px 2px;
     {
       border              : 1px inset #CCD0DD;
       padding             : 2px 0px 0px 2px;

-    }    
-    
-
-
+    }

diff --git a/EarlyBlue/global/skin/menubuttonBindings.xml b/EarlyBlue/global/skin/menubuttonBindings.xml
index 941e0ad751cd1f69fac7ac68c886eee43468aca6..a122cc934804ff23f882aa72c0ab8417a5ec2ff7 100755 (executable)
--- a/EarlyBlue/global/skin/menubuttonBindings.xml
+++ b/EarlyBlue/global/skin/menubuttonBindings.xml
@@ -12,7 +12,7 @@
                   onmouseup="this.parentNode.removeAttribute('buttondown');"
                   onmouseover="this.parentNode.setAttribute('buttonover','true');"
                   onmouseout="this.parentNode.removeAttribute('buttonover');"/>
                   onmouseup="this.parentNode.removeAttribute('buttondown');"
                   onmouseover="this.parentNode.setAttribute('buttonover','true');"
                   onmouseout="this.parentNode.removeAttribute('buttonover');"/>

-      <xul:box class="classic-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
+      <xul:box class="classic-dropmarker-box" autostretch="never" align="center" inherits="disabled">

         <xul:image class="classic-dropmarker" inherits="disabled"/>
       </xul:box>
     </content>
         <xul:image class="classic-dropmarker" inherits="disabled"/>
       </xul:box>
     </content>


@@ -28,7 +28,7 @@
   </binding>
 
   <binding id="buttontop" extends="chrome://global/content/xulBindings.xml#basetext">
   </binding>
 
   <binding id="buttontop" extends="chrome://global/content/xulBindings.xml#basetext">

-    <content excludes="observes,template" orient="vertical" autostretch="never" halign="middle">
+    <content excludes="observes,template" orient="vertical" autostretch="never" pack="center">

       <xul:image class="classic-simplebutton-icon" inherits="src"/>
       <xul:box orient="vertical" class="classic-simplebutton-textbox" autostretch="never" flex="1">
         <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>
       <xul:image class="classic-simplebutton-icon" inherits="src"/>
       <xul:box orient="vertical" class="classic-simplebutton-textbox" autostretch="never" flex="1">
         <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>


@@ -37,4 +37,3 @@
   </binding>
   
 </bindings>
   </binding>
   
 </bindings>

-

diff --git a/EarlyBlue/global/skin/menulistBindings.xml b/EarlyBlue/global/skin/menulistBindings.xml
index 52ba8465f76400e92b089c50173ae1d3a8524572..cdc959242851772fcc6c77d6c810b09d7822ba2b 100755 (executable)
--- a/EarlyBlue/global/skin/menulistBindings.xml
+++ b/EarlyBlue/global/skin/menulistBindings.xml
@@ -8,12 +8,12 @@
   <binding id="menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content excludes="template,observes,menupopup" flex="1">
       <xul:box class="menulist-internal-box" flex="1">
   <binding id="menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content excludes="template,observes,menupopup" flex="1">
       <xul:box class="menulist-internal-box" flex="1">

-        <xul:box class="menulist-display-box" flex="1" valign="middle" autostretch="never">
+        <xul:box class="menulist-display-box" flex="1" align="center" autostretch="never">

           <xul:image class="menulist-icon" inherits="src"/>
           <xul:text class="menulist-text" inherits="value=label,accesskey,crop" crop="right"/>
         </xul:box>
           <xul:image class="menulist-icon" inherits="src"/>
           <xul:text class="menulist-text" inherits="value=label,accesskey,crop" crop="right"/>
         </xul:box>

-        <xul:box class="menulist-dropmarker-box-1" valign="middle" inherits="open">
-          <xul:box class="menulist-dropmarker-box-2" flex="1" autostretch="never" valign="middle" inherits="open">
+        <xul:box class="menulist-dropmarker-box-1" align="center" inherits="open">
+          <xul:box class="menulist-dropmarker-box-2" flex="1" autostretch="never" align="center" inherits="open">

             <xul:image class="menulist-dropmarker" inherits="disabled"/>
           </xul:box>
         </xul:box>
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
           </xul:box>
         </xul:box>

diff --git a/EarlyBlue/global/skin/outliner.css b/EarlyBlue/global/skin/outliner.css
index 9b8033730c782a854e935a5bc9f0efa8492e374d..5f43f2ace6a233e35591ad4fdcfd09d340a2cd50 100644 (file)
--- a/EarlyBlue/global/skin/outliner.css
+++ b/EarlyBlue/global/skin/outliner.css
@@ -54,7 +54,7 @@ outlinerbody:-moz-outliner-cell
 {
   padding: 0px 0px 1px 2px;
   white-space: nowrap;
 {
   padding: 0px 0px 1px 2px;
   white-space: nowrap;

-  vertical-align: middle;
+  -moz-box-align: center;

 }
 
 outlinerbody:-moz-outliner-cell(selected)
 }
 
 outlinerbody:-moz-outliner-cell(selected)


@@ -157,6 +157,3 @@ outlinerbody:-moz-outliner-twisty(open) {
   width: 12px; /* The image's width is 12 pixels */
   list-style-image: url("chrome://global/skin/twisty-open.gif");
 }
   width: 12px; /* The image's width is 12 pixels */
   list-style-image: url("chrome://global/skin/twisty-open.gif");
 }

-
-
-

diff --git a/EarlyBlue/global/skin/popup.css b/EarlyBlue/global/skin/popup.css
index d0711fbb5f19b7ce12725a8870dd63317b876213..c3bd8cfb1a3ed8d1c1fef633df1b475679b21c02 100644 (file)
--- a/EarlyBlue/global/skin/popup.css
+++ b/EarlyBlue/global/skin/popup.css
@@ -14,10 +14,10 @@ menupopup, popup
     padding               : 1px;
   }  
   
     padding               : 1px;
   }  
   

-/** Tooltips (tooltip <popup> element)
+/** Tooltips (tooltip <popup> is deprecated, use <tooltip> element)

  *  class="tooltip"
  **/
  *  class="tooltip"
  **/

-.tooltip
+.tooltip, tooltip

   {
     background-color      : #FFFFCC;
     border                : 1px outset #FFFFCC;
   {
     background-color      : #FFFFCC;
     border                : 1px outset #FFFFCC;


@@ -26,7 +26,8 @@ menupopup, popup
     padding               : 3px;
   }
 
     padding               : 3px;
   }
 

-.tooltip > .popup-internal-box
+.tooltip > .popup-internal-box,
+tooltip > .popup-internal-box

   {
     padding               : 0px;
     margin                : 0px;
   {
     padding               : 0px;
     margin                : 0px;


@@ -41,4 +42,3 @@ menupopup, popup
       min-width           : 0px;
       background-color    : white;
     }
       min-width           : 0px;
       background-color    : white;
     }

-

diff --git a/EarlyBlue/global/skin/scrollbarBindings.xml b/EarlyBlue/global/skin/scrollbarBindings.xml
index 0cbdd1a28a94a5d3ff2f4013340b20b257d71242..8c024accf43ef4b85b3ec8c3e8a453fd5fa49e36 100644 (file)
--- a/EarlyBlue/global/skin/scrollbarBindings.xml
+++ b/EarlyBlue/global/skin/scrollbarBindings.xml
@@ -9,29 +9,29 @@
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   

-  <binding id="thumbv" extends="xul:box">
-    <content align="vertical">
+  <binding id="thumbv" extends="xul:vbox">
+    <content>

       <xul:image inherits="src"/>
     </content>
   </binding>
 
       <xul:image inherits="src"/>
     </content>
   </binding>
 

-  <binding id="thumbh" extends="xul:box">
+  <binding id="thumbh" extends="xul:hbox">

     <content>
       <xul:image inherits="src"/>
     </content>
   </binding>
 
     <content>
       <xul:image inherits="src"/>
     </content>
   </binding>
 

-  <binding id="scrollbar" extends="xul:scrollbar">
+  <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">

     <content>
     <content>

-      <xul:scrollbarbutton type="decrement" inherits="sborient=align"/>
+      <xul:scrollbarbutton type="decrement" inherits="sborient=orient"/>

       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
         <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
         <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>

-      <xul:scrollbarbutton type="increment" inherits="sborient=align"/>
+      <xul:scrollbarbutton type="increment" inherits="sborient=orient"/>

     </content>
   </binding>
 
     </content>
   </binding>
 

-  <binding id="scrollbarbutton">
+  <binding id="scrollbarbutton" extends="chrome://global/content/bindings/scrollbar.xml#scrollbarbutton">

     <content>
       <xul:box class="scrollbarbutton-box" flex="1">
         <xul:image class="scrollbarbutton-icon" inherits="src"/>
     <content>
       <xul:box class="scrollbarbutton-box" flex="1">
         <xul:image class="scrollbarbutton-icon" inherits="src"/>


@@ -41,7 +41,3 @@
 
 
 </bindings>
 
 
 </bindings>

-
-
-
-

diff --git a/EarlyBlue/global/skin/scrollbars.css b/EarlyBlue/global/skin/scrollbars.css
index e90215434ed068f542d6d5d328c550e668a61854..e304a8c26fa6d912520c64bf1fc454a5fbbf9df0 100755 (executable)
--- a/EarlyBlue/global/skin/scrollbars.css
+++ b/EarlyBlue/global/skin/scrollbars.css
@@ -13,20 +13,20 @@ thumb {
   background-color: #CCCCCC;
   border: 1px outset #CCCCCC;
   list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif");
   background-color: #CCCCCC;
   border: 1px outset #CCCCCC;
   list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif");

-  text-align: center;
-  vertical-align: middle;
+  -moz-box-pack: center;
+  -moz-box-align: center;

 }
 
 thumb[disabled="true"] {
    list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
 }
 
 }
 
 thumb[disabled="true"] {
    list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
 }
 

-scrollbar[align="vertical"] > slider > thumb {
+scrollbar[orient="vertical"] > slider > thumb {

   -moz-binding: url(chrome://global/skin/scrollbarBindings.xml#thumbv); 
    list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif")
 }
 
   -moz-binding: url(chrome://global/skin/scrollbarBindings.xml#thumbv); 
    list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif")
 }
 

-scrollbar[align="vertical"] > slider > thumb[disabled="true"] {
+scrollbar[orient="vertical"] > slider > thumb[disabled="true"] {

    list-style-image: url("chrome://global/skin/scroll-thumb-vert-disabled.gif")
 }
 
    list-style-image: url("chrome://global/skin/scroll-thumb-vert-disabled.gif")
 }
 


@@ -39,7 +39,7 @@ thumb:active {
 
 scrollbarbutton {
   -moz-binding: url(chrome://global/skin/scrollbarBindings.xml#scrollbarbutton); 
 
 scrollbarbutton {
   -moz-binding: url(chrome://global/skin/scrollbarBindings.xml#scrollbarbutton); 

-  vertical-align: middle;
+  -moz-box-align: center;

   cursor: default;
 
   border: 1px outset white;
   cursor: default;
 
   border: 1px outset white;


@@ -76,26 +76,22 @@ scrollbarbutton[type="increment"][disabled="true"] {
 }
 
 
 }
 
 

-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"] {
+scrollbarbutton[type="decrement"][sborient="vertical"] {

    list-style-image: url("chrome://global/skin/scroll-up.gif")
 }
 
    list-style-image: url("chrome://global/skin/scroll-up.gif")
 }
 

-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] {
+scrollbarbutton[type="decrement"][disabled="true"][sborient="vertical"] {

    list-style-image: url("chrome://global/skin/scroll-up-disabled.gif") 
 }
 
    list-style-image: url("chrome://global/skin/scroll-up-disabled.gif") 
 }
 

-scrollbar[align="vertical"] > scrollbarbutton[type="increment"] {
+scrollbarbutton[type="increment"][sborient="vertical"] {

    list-style-image: url("chrome://global/skin/scroll-down.gif")
 }
 
    list-style-image: url("chrome://global/skin/scroll-down.gif")
 }
 

-scrollbar[align="vertical"] > scrollbarbutton[type="increment"][disabled="true"] {
+scrollbarbutton[type="increment"][disabled="true"][sborient="vertical"] {

    list-style-image: url("chrome://global/skin/scroll-down-disabled.gif") 
 }
 
 slider {
    background-color: #999999;
 }
    list-style-image: url("chrome://global/skin/scroll-down-disabled.gif") 
 }
 
 slider {
    background-color: #999999;
 }

-
-
-
-

diff --git a/EarlyBlue/global/skin/scrollbox.css b/EarlyBlue/global/skin/scrollbox.css
index e704af7e7bdd6518452b01faac887ac6bb09984b..223710aa94ab729fa59827d131c0cf3a3e2dcf9c 100644 (file)
--- a/EarlyBlue/global/skin/scrollbox.css
+++ b/EarlyBlue/global/skin/scrollbox.css
@@ -14,8 +14,8 @@ autorepeatbutton {
     border                : 1px solid transparent;
     padding               : 1px;
     height                : 1em;  
     border                : 1px solid transparent;
     padding               : 1px;
     height                : 1em;  

-    text-align            : center;
-    vertical-align        : middle;
+    -moz-box-pack         : center;
+    -moz-box-align        : center;

 }
 
 autorepeatbutton:hover {
 }
 
 autorepeatbutton:hover {


@@ -24,4 +24,3 @@ autorepeatbutton:hover {
     border                : 1px inset #CCD0DD;
     padding               : 2px 1px 1px 2px;
 }
     border                : 1px inset #CCD0DD;
     padding               : 2px 1px 1px 2px;
 }

-

diff --git a/EarlyBlue/global/skin/splitter.css b/EarlyBlue/global/skin/splitter.css
index c3e43db8fd4782a70cdf3dda88db01acc970088c..fed6516f0ee19053a2289a15bc6175ecbdef86d7 100755 (executable)
--- a/EarlyBlue/global/skin/splitter.css
+++ b/EarlyBlue/global/skin/splitter.css
@@ -4,8 +4,8 @@ splitter
   {
     cursor                : e-resize;
     background-color      : #CCD0DD;
   {
     cursor                : e-resize;
     background-color      : #CCD0DD;

-    vertical-align        : middle;
-    text-align            : center;
+    -moz-box-align        : center;
+    -moz-box-pack         : center;

     padding               : 0px;
   }
 
     padding               : 0px;
   }
 


@@ -47,14 +47,10 @@ grippy:hover:active
     }
   
 /* horizontal splitters */  
     }
   
 /* horizontal splitters */  

-  /* XXX we should comment out the 'align' support to force people to migrate 
-         to 'orient' */

   rows > splitter,
   window[orient="vertical"] > splitter,
   vbox > splitter,
   rows > splitter,
   window[orient="vertical"] > splitter,
   vbox > splitter,

-  box[orient="vertical"] > splitter,
-  window[align="vertical"] > splitter,
-  box[align="vertical"] > splitter
+  box[orient="vertical"] > splitter

     {
       cursor              : n-resize;
       border-top          : 1px solid #9999CC;
     {
       cursor              : n-resize;
       border-top          : 1px solid #9999CC;


@@ -64,9 +60,7 @@ grippy:hover:active
   rows > splitter > grippy,
   window[orient="vertical"] > splitter > grippy,
   vbox > splitter > grippy,
   rows > splitter > grippy,
   window[orient="vertical"] > splitter > grippy,
   vbox > splitter > grippy,

-  box[orient="vertical"] > splitter > grippy,
-  window[align="vertical"] > splitter > grippy,
-  box[align="vertical"] > splitter > grippy
+  box[orient="vertical"] > splitter > grippy

     {
       list-style-image      : url("chrome://global/skin/grippy-horizontal-before.gif");
     }
     {
       list-style-image      : url("chrome://global/skin/grippy-horizontal-before.gif");
     }


@@ -74,10 +68,7 @@ grippy:hover:active
   rows > splitter[state="collapsed"] > grippy,
   window[orient="vertical"] > splitter[state="collapsed"] > grippy,
   vbox > splitter[state="collapsed"] > grippy,
   rows > splitter[state="collapsed"] > grippy,
   window[orient="vertical"] > splitter[state="collapsed"] > grippy,
   vbox > splitter[state="collapsed"] > grippy,

-  box[orient="vertical"] > splitter[state="collapsed"] > grippy,
-  window[align="vertical"] > splitter[state="collapsed"] > grippy,
-  box[align="vertical"] > splitter[state="collapsed"] > grippy
+  box[orient="vertical"] > splitter[state="collapsed"] > grippy

     {
       list-style-image      : url("chrome://global/skin/grippy-horizontal-after.gif");
     }
     {
       list-style-image      : url("chrome://global/skin/grippy-horizontal-after.gif");
     }

-

diff --git a/EarlyBlue/global/skin/titledbox.css b/EarlyBlue/global/skin/titledbox.css
index 98945cc0356aac0696efa11338edb7d67635a8eb..ed2ae84629bb96b4a8f8d846f2226571f014e4dd 100644 (file)
--- a/EarlyBlue/global/skin/titledbox.css
+++ b/EarlyBlue/global/skin/titledbox.css
@@ -1,18 +1,18 @@
-titledbox
+groupbox

   {
     border                : 2px groove #CCD0DD;
     padding               : 7px !important;
     margin                : 5px;
   }
   {
     border                : 2px groove #CCD0DD;
     padding               : 7px !important;
     margin                : 5px;
   }

-label
+
+groupbox > label

   {
     margin                : 0px 40px 2px 6px;
     padding               : 0px 3px 0px 3px;
     background-color      : ThreeDFace;
   }
 
   {
     margin                : 0px 40px 2px 6px;
     padding               : 0px 3px 0px 3px;
     background-color      : ThreeDFace;
   }
 

-.titledbox-body
+.groupbox-body

   {
     padding               : inherit;
   }
   {
     padding               : inherit;
   }

-

diff --git a/EarlyBlue/global/skin/tree.css b/EarlyBlue/global/skin/tree.css
index 6f25760b8856521e2f5a4e0f5959fe6b75478f93..55144eb02969df904963751c059503453bca84db 100755 (executable)
--- a/EarlyBlue/global/skin/tree.css
+++ b/EarlyBlue/global/skin/tree.css
@@ -29,7 +29,7 @@ treeitem[dd-dropon="true"] > treerow
 
 treecell { 
   white-space: nowrap;
 
 treecell { 
   white-space: nowrap;

-  vertical-align: middle;
+  -moz-box-align: center;

   padding: 1px 0px 1px 2px;
 } 
 
   padding: 1px 0px 1px 2px;
 } 
 


@@ -44,7 +44,7 @@ treecell {
   background-color: #CCD0DD; 
   color: black;
   border: 1px outset #CCD0DD;
   background-color: #CCD0DD; 
   color: black;
   border: 1px outset #CCD0DD;

-  vertical-align: middle;
+  -moz-box-align: center;

   padding: 0px;
 }
 
   padding: 0px;
 }
 


@@ -160,8 +160,3 @@ treecol[sortActive="true"]
   {
     margin-left           : 2px;
   }
   {
     margin-left           : 2px;
   }

-
-
-
-
-

diff --git a/EarlyBlue/global/skin/treeBindings.xml b/EarlyBlue/global/skin/treeBindings.xml
index 1203d58190b68abf496a059cfee65e7e4db149a3..525d9a76db842443e1e73946f7e8b833d9f42ac1 100755 (executable)
--- a/EarlyBlue/global/skin/treeBindings.xml
+++ b/EarlyBlue/global/skin/treeBindings.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>\r
-\r
-<bindings id="treeBindings"\r
-   xmlns="http://www.mozilla.org/xbl"\r
-   xmlns:html="http://www.w3.org/1999/xhtml"\r
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">\r
-\r
-  <binding id="treecell-header">\r
-    <content excludes="observes">\r
-      <xul:box class="treecell-header-box" flex="1" autostretch="never" valign="middle">\r
-        <xul:image class="tree-header-image" inherits="src"/>\r
-        <xul:text class="tree-header-text" inherits="crop,value" flex="1" crop="right"/>\r
-        <xul:image class="tree-header-sortdirection"/>\r
-      </xul:box>\r
-    </content>\r
-  </binding>\r
-   \r
-</bindings>
\ No newline at end of file
+<?xml version="1.0"?>
+
+<bindings id="treeBindings"
+   xmlns="http://www.mozilla.org/xbl"
+   xmlns:html="http://www.w3.org/1999/xhtml"
+   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <binding id="treecell-header">
+    <content excludes="observes">
+      <xul:hbox class="treecell-header-box" flex="1" autostretch="never" align="center">
+        <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"/>
+      </xul:hbox>
+    </content>
+  </binding>
+   
+</bindings>

diff --git a/EarlyBlue/messenger/skin/mailheader.css b/EarlyBlue/messenger/skin/mailheader.css
index cea2463104af1ea7db6b2d039bc27e8bb60ca9f0..043dbfc590989cde4cf6fb16beee06f69252a5d7 100755 (executable)
--- a/EarlyBlue/messenger/skin/mailheader.css
+++ b/EarlyBlue/messenger/skin/mailheader.css
@@ -12,7 +12,7 @@ box[name=header-part3]      { background-color: #DEDEDE; border: 0px solid #DEDE
 box[name=header-seamonkey]  { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 
 headerdisplayname                            { font-weight: bold;  white-space: pre; }
 box[name=header-seamonkey]  { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
 
 headerdisplayname                            { font-weight: bold;  white-space: pre; }

-header                                                   { text-align: left; }
+header                                                   { -moz-box-pack: start; }

 
 menubar[name=attachment-menubar]  { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
 menu[name=attachment-menu]        { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
 
 menubar[name=attachment-menubar]  { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
 menu[name=attachment-menu]        { background-color: #EFEFEF; border: 0px solid #EFEFEF; }


@@ -76,4 +76,3 @@ body {
 .moz-txt-sig > a, .moz-signature > a {
   color: 7777FF /* light blue */;
 }
 .moz-txt-sig > a, .moz-signature > a {
   color: 7777FF /* light blue */;
 }

-

diff --git a/EarlyBlue/messenger/skin/messenger.css b/EarlyBlue/messenger/skin/messenger.css
index 4a7d1f0fe0475db0173c4960f08dfdc021c57e81..48ad01dd3e0810a70a524aee49f732ef64a475e0 100755 (executable)
--- a/EarlyBlue/messenger/skin/messenger.css
+++ b/EarlyBlue/messenger/skin/messenger.css
@@ -121,14 +121,14 @@ iframe {
 
 #button-file > .button-internal-box 
 {
 
 #button-file > .button-internal-box 
 {

-        vertical-align: middle;
-        text-align: center;
+        -mox-box-align      : center;
+        -moz-box-pack       : center;

 }
 
 #button-file > .button-internal-box > .menubutton-single-text 
 {
         padding-top         : 3px;
 }
 
 #button-file > .button-internal-box > .menubutton-single-text 
 {
         padding-top         : 3px;

-        text-align          : center;
+        -moz-box-pack       : center;

 }
 
 #button-next {
 }
 
 #button-next {


@@ -241,7 +241,7 @@ menu.push {
   border: 1px outset white;
   padding: 2px;
   margin: 2px;
   border: 1px outset white;
   padding: 2px;
   margin: 2px;

-  text-align: center;
+  -moz-box-pack: center;

   background-color:inherit;
   background-image: inherit;
 }
   background-color:inherit;
   background-image: inherit;
 }


@@ -435,4 +435,3 @@ searchterm
 {
   border-left          : none;
 }
 {
   border-left          : none;
 }

-

diff --git a/EarlyBlue/messenger/skin/messengercompose/messengercompose.css b/EarlyBlue/messenger/skin/messengercompose/messengercompose.css
index 100663501f4a9d927b95e34ba45febc48347ad4e..76b414d249c60999ed60a77963e4b43d581e3cb6 100755 (executable)
--- a/EarlyBlue/messenger/skin/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/skin/messengercompose/messengercompose.css
@@ -31,7 +31,7 @@
 
 .treecell-addressingWidget
   {
 
 .treecell-addressingWidget
   {

-       vertical-align        : middle;
+    -moz-box-align        : center;

     border-bottom         : 1px solid #CCD0DD;
     padding               : 0px !important;
   }
     border-bottom         : 1px solid #CCD0DD;
     padding               : 0px !important;
   }


@@ -149,7 +149,7 @@
 }
 
 #askImageBox {
 }
 
 #askImageBox {

-        vertical-align: top;
+        -moz-box-align: start;

 }
 
 #convertYes {
 }
 
 #convertYes {


@@ -163,5 +163,3 @@
 #convertNo {
        list-style-image:url("chrome://global/skin/alert-icon.gif");
 }
 #convertNo {
        list-style-image:url("chrome://global/skin/alert-icon.gif");
 }

-
-

diff --git a/EarlyBlue/messenger/skin/msgAccountCentral.css b/EarlyBlue/messenger/skin/msgAccountCentral.css
index f9f1d18934fec04ab937d7b5729042da9f19ea7d..6bb43df91dec60637784816926089a6d877d11de 100644 (file)
--- a/EarlyBlue/messenger/skin/msgAccountCentral.css
+++ b/EarlyBlue/messenger/skin/msgAccountCentral.css
@@ -32,7 +32,7 @@
   font-size:20px;
   margin:5px 5px 5px 5px;
   border-bottom: 2px solid black;
   font-size:20px;
   margin:5px 5px 5px 5px;
   border-bottom: 2px solid black;

-  text-align: left;
+  -moz-box-pack: start;

 }
 
 .acctCentralRow
 }
 
 .acctCentralRow


@@ -72,6 +72,3 @@
 {
   cursor:pointer;
 }
 {
   cursor:pointer;
 }

-
-
-

diff --git a/EarlyBlue/messenger/skin/msgHdrViewOverlay.css b/EarlyBlue/messenger/skin/msgHdrViewOverlay.css
index d61df3d5d3d0b72986679b95c16bd3107dae3905..c95320291572b6923954766fdcde49991a860b6a 100755 (executable)
--- a/EarlyBlue/messenger/skin/msgHdrViewOverlay.css
+++ b/EarlyBlue/messenger/skin/msgHdrViewOverlay.css
@@ -173,11 +173,11 @@ text.headerValue
 /* ::::: collapsed view styles ::::: */
 .collapsedToggleHdrBox
 {
 /* ::::: collapsed view styles ::::: */
 .collapsedToggleHdrBox
 {

-  vertical-align: middle;
+  -moz-box-align: center;

 }
 
 #collapsedAttachmentBox {
 }
 
 #collapsedAttachmentBox {

-  text-align: center;
+  -moz-box-pack: center;

 }
 
 #collapseddateValue
 }
 
 #collapseddateValue


@@ -212,8 +212,3 @@ text.collapsedHeaderDisplayName
 [hide] {
   visibility: hidden;
 }
 [hide] {
   visibility: hidden;
 }

-
-
-
-
-

diff --git a/EarlyBlue/navigator/skin/navigator.css b/EarlyBlue/navigator/skin/navigator.css
index 7b47b799f2bf172f520bd1f4879dc774bc758ab0..072ccfdda8d5f66b766a702191f95bd43ca23bc4 100755 (executable)
--- a/EarlyBlue/navigator/skin/navigator.css
+++ b/EarlyBlue/navigator/skin/navigator.css
@@ -119,7 +119,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
     padding-left          : 0px;
     padding-top           : 11px;
     padding-bottom        : 11px;
     padding-left          : 0px;
     padding-top           : 11px;
     padding-bottom        : 11px;

-    vertical-align        : middle;
+    -moz-box-align        : center;

   }
 
 #search-button
   }
 
 #search-button


@@ -190,5 +190,3 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
   {
     margin-right          : 5px;
   }
   {
     margin-right          : 5px;
   }

-
-