adopting to recent XUL changes

diff --git a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebar.css b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebar.css
index 88e7f7b48a88646c641e0a6452e039bf0d43eda1..ce55b858ace8d353534f3a0fb71d73862481bc24 100644 (file)
--- a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebar.css
+++ b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebar.css
@@ -141,3 +141,7 @@
     {
     } 
 
+  .panelheader-text
+    {
+      margin              : 0px;
+    } 

diff --git a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarBindings.xml b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarBindings.xml
index 1118a8d314c517001238aac700cdc0ea98f918f4..2495c6ef780ec5fd88d636efac0892495091f051 100644 (file)
--- a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarBindings.xml
+++ b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarBindings.xml
@@ -11,7 +11,7 @@
           <xul:image class="panelheader-grippy-icon" inherits="selected"/>
           <xul:image class="panelheader-image" inherits="src"/>
           <xul:vbox flex="1">
-            <xul:text class="panelheader-icon" inherits="value=label" crop="right"/>
+            <xul:label class="panelheader-icon" inherits="value=label" crop="right"/>
           </xul:vbox>
           <xul:spacer flex="1"/>
         </xul:hbox>
@@ -19,4 +19,4 @@
       </xul:hbox>
     </content>
   </binding>
-</bindings>          
\ No newline at end of file
+</bindings>          

diff --git a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarSplitterBindings.xml b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarSplitterBindings.xml
index 666fe1f336a77342a746111fd67bb893333e78fd..167d3fd4932c0db14c2e320387aa85520989c691 100644 (file)
--- a/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarSplitterBindings.xml
+++ b/LCARStrek/skin/LCARStrek/communicator/sidebar/sidebarSplitterBindings.xml
@@ -24,9 +24,9 @@
     <content>
       <xul:hbox class="panelheader-box-1" flex="1">
         <xul:image class="panelheader-image" inherits="src"/>
-        <xul:text class="panelheader-icon" inherits="value=label,crop"/>
+        <xul:label class="panelheader-icon" inherits="value=label,crop"/>
       </xul:hbox>
     </content>
   </binding>
           
-</bindings> 
\ No newline at end of file
+</bindings> 

diff --git a/LCARStrek/skin/LCARStrek/global/buttonBindings.xml b/LCARStrek/skin/LCARStrek/global/buttonBindings.xml
index 5bf0549d3c9f5d6cf87a383a06b2946b6f22232f..e22109ea4c57be56dd1d211f8498ed95057f8aa3 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/buttonBindings.xml
+++ b/LCARStrek/skin/LCARStrek/global/buttonBindings.xml
@@ -27,9 +27,9 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-        <xul:text class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
+        <xul:label class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
       </xul:vbox>
     </content>
   </binding>
   
-</bindings>
\ No newline at end of file
+</bindings>

diff --git a/LCARStrek/skin/LCARStrek/global/classicBindings.xml b/LCARStrek/skin/LCARStrek/global/classicBindings.xml
index ab5e16365f78487dbeaf621456bf8b6c6fa5fd53..3c391b6a39379d07c44d7d428349bd16f0310b56 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/classicBindings.xml
+++ b/LCARStrek/skin/LCARStrek/global/classicBindings.xml
@@ -7,8 +7,8 @@
   <binding id="textdisabled" extends="xul:text">
     <content>
       <xul:stack>
-        <xul:text class="text-bottom" inherits="value,accesskey,crop"/>
-        <xul:text class="text-top" inherits="value,accesskey,crop"/>
+        <xul:label class="text-bottom" inherits="value,accesskey,crop"/>
+        <xul:label class="text-top" inherits="value,accesskey,crop"/>
       </xul:stack>
     </content>
   </binding>
@@ -38,12 +38,12 @@
       <xul:hbox flex="1" class="radio-internal-box" align="center">
         <xul:hbox class="radio-checkmark-box-1" align="center" inherits="disabled">
           <xul:hbox class="radio-checkmark-box-2" align="center" flex="1">
-            <xul:image class="radio-check" inherits="checked,disabled"/>
+            <xul:image class="radio-check" inherits="selected,disabled"/>
           </xul:hbox>
         </xul:hbox>
         <xul:hbox class="radio-text-container" flex="1" align="center">
           <xul:image class="radio-icon" inherits="src,disabled"/>
-          <xul:html class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+          <xul:label class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
         </xul:hbox>          
       </xul:hbox>
     </content>
@@ -58,7 +58,7 @@
           </xul:hbox>
         </xul:hbox>
         <xul:image class="checkbox-icon" inherits="src,disabled"/>
-        <xul:html class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+        <xul:label class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
       </xul:hbox>
     </content>
   </binding>
@@ -112,8 +112,8 @@
         <xul:image/>
       </xul:vbox>
       <xul:spacer class="menuitem-iconic-spacer"/>
-      <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
-      <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
+      <xul:label class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:label class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
   </binding>
 
@@ -122,8 +122,8 @@
       <xul:hbox class="largeheader-box" flex="1">
         <xul:vbox class="largeheader-text-container">
           <xul:spacer flex="1"/>
-          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
-          <xul:html class="largeheader-desc-text" inherits="value=description"/>
+          <xul:label class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:label class="largeheader-desc-text" inherits="value=description"/>
           <xul:spacer flex="1"/>
         </xul:vbox>
         <xul:spacer flex="1"/>
@@ -138,7 +138,7 @@
     <content>
       <xul:hbox flex="1" align="center">
         <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-left-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-left-text" inherits="value=label,crop"/>
       </xul:hbox>
     </content>
   </binding>  
@@ -147,7 +147,7 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-top-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-top-text" inherits="value=label,crop"/>
       </xul:vbox>
     </content>
   </binding>  
@@ -164,8 +164,8 @@
   <binding id="disabled-text" extends="xul:stack">
     <content>
       <xul:stack class="disabled-text-stack">
-        <xul:text class="disabled-text-bottom"/>
-        <xul:text class="disabled-text-top"/>
+        <xul:label class="disabled-text-bottom"/>
+        <xul:label class="disabled-text-top"/>
       </xul:stack>        
     </content>  
   </binding>
@@ -179,6 +179,3 @@
   </binding>
 
 </bindings>
-
-
-

diff --git a/LCARStrek/skin/LCARStrek/global/formatting.css b/LCARStrek/skin/LCARStrek/global/formatting.css
index e7c9d91074dcf5c859237babba1c5362ca329b0d..7d7fec6fe4489967054398a2395c074aeb202d09 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/formatting.css
+++ b/LCARStrek/skin/LCARStrek/global/formatting.css
@@ -1,17 +1,3 @@
-/* colors */
-
-.color-dialog
-  {
-    background-color      : #000000;
-    color                 : #FF9F00;
-  }
-  
-.color-window
-  {
-    background-color      : #000000;
-    color                 : #FF9F00;
-  }
-
 /* inset areas */
 .inset
   {
@@ -106,33 +92,25 @@
     }
 
 /** text formatting rules **/
-/* label (with margins) */
-  text.label 
-    {
-      margin              : 1px 5px 2px 6px;
-    }
-
 /** Reduced Margin for some UI **/
   .small-margin
     {
-      margin              : 1px 2px 1px 2px;
+/*      margin              : 1px 2px 1px 2px; */
     }
     
-  text[disabled="true"] 
+  label[disabled="true"] 
     {
       color               : #8050B0;
     }    
     
-  html, description
+  description
     {
-      margin              : 1px 5px 4px 5px;
-      cursor              : default;
+/*      margin              : 1px 5px 4px 5px; */
     }
 
   label
     {
-      margin              : 1px 5px 2px 6px;
-      cursor              : default;
+/*      margin              : 1px 5px 2px 6px; */
     }
 
   .header 
@@ -216,3 +194,7 @@
     }   
 */
 
+  .caption-text
+    {
+      margin: 0px 2px 0px 1px !important;
+    }

diff --git a/LCARStrek/skin/LCARStrek/global/global.css b/LCARStrek/skin/LCARStrek/global/global.css
index af36f6ab48cd77b015126d5fe6c965a4aa48a310..dd16f3e221bef192c0b7d53c49f6a7eb30ecd2e8 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/global.css
+++ b/LCARStrek/skin/LCARStrek/global/global.css
@@ -271,7 +271,7 @@ button[type="menu-button"] {
 caption
   {
     -moz-border-radius    : 7px;
-    margin                : 0px 40px 2px 6px;
+    margin                : 0px 6px 2px 6px;
     padding               : 0px 0px 0px 0px;
     background-color      : #9C9CFF;
     color                 : #000000;
@@ -281,5 +281,3 @@ caption
   {
     margin                : 0px;
   }
-
-

diff --git a/LCARStrek/skin/LCARStrek/global/menulistBindings.xml b/LCARStrek/skin/LCARStrek/global/menulistBindings.xml
index 91b622e3c1c352ca4e65992c63285513e6d084c9..8ea276c52328c22f713f166e9574c14214146743 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/menulistBindings.xml
+++ b/LCARStrek/skin/LCARStrek/global/menulistBindings.xml
@@ -11,7 +11,7 @@
       <xul:hbox class="menulist-internal-box" flex="1">
         <xul:hbox class="menulist-display-box" flex="1" align="center">
           <xul:image class="menulist-icon" inherits="src"/>
-          <xul:text class="menulist-text" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+          <xul:label class="menulist-text" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
         </xul:hbox>
         <xul:hbox class="menulist-dropmarker-box-1" inherits="open">
           <xul:hbox class="menulist-dropmarker-box-2" flex="1" align="center" pack="center" inherits="open">
@@ -55,10 +55,10 @@
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spacer flex="1"/>
-        <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
+        <xul:label class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
 
-</bindings>
\ No newline at end of file
+</bindings>

diff --git a/LCARStrek/skin/LCARStrek/global/outliner.css b/LCARStrek/skin/LCARStrek/global/outliner.css
index 1fae4cf962ab6cb4383492351ad42e92c3d5ad40..7f9578b060b79aaf8d764e4d61eb2a9529ec86d1 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/outliner.css
+++ b/LCARStrek/skin/LCARStrek/global/outliner.css
@@ -181,3 +181,7 @@ outlinerbody:-moz-outliner-twisty(open) {
 outlinerbody:-moz-outliner-indentation {
   width: 8px;
 }
+
+.outlinercol-text {
+   margin: 0px;
+}

diff --git a/LCARStrek/skin/LCARStrek/global/radio.css b/LCARStrek/skin/LCARStrek/global/radio.css
index 8247edc5c5722a0386d5e9496ecc1315b8f86879..d925f2ea0a8ab8dbb0c663a56269b96af1dd3ac7 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/radio.css
+++ b/LCARStrek/skin/LCARStrek/global/radio.css
@@ -38,12 +38,12 @@
       list-style-image    : none;
     }
 
-  .radio-check[checked="true"]
+  .radio-check[selected="true"]
     {
       list-style-image    : url(chrome://global/skin/check-radio.gif);
     }
   
-  .radio-check[checked="true"][disabled="true"]
+  .radio-check[selected="true"][disabled="true"]
     {
       list-style-image    : url(chrome://global/skin/check-radio-disabled.gif);
     }

diff --git a/LCARStrek/skin/LCARStrek/global/tabbox.css b/LCARStrek/skin/LCARStrek/global/tabbox.css
index 0ae45b5637777964ccc895af78b4945f38baed8f..910feecd4499855e31f6311500e2cbbce7e71a25 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/tabbox.css
+++ b/LCARStrek/skin/LCARStrek/global/tabbox.css
@@ -17,7 +17,7 @@ tabs + tabpanels {
 }
 
 /* bottom tabs */
-tabbox[orient="vertical"] > tabpanels {
+tabbox > tabpanels {
   -moz-border-radius: 5px;
   border: 1px solid #9C9CFF;
   padding: 5px;
@@ -50,11 +50,11 @@ tabpanels.light {
 /* tabs-spacer ========================== */
 
 /* top tabs */
-tabbox[orient="vertical"] > tabs > .tabs-spacer {
+tabbox > tabs > .tabs-spacer {
 }
 
 /* bottom tabs */
-tabbox[orient="vertical"] > tabpanels + tabs > .tabs-spacer {
+tabbox > tabpanels + tabs > .tabs-spacer {
 }
 
 /* left tabs */
@@ -168,4 +168,3 @@ tab:hover {
 tab:hover:active { 
   text-decoration: none;
 }
-

diff --git a/LCARStrek/skin/LCARStrek/global/tree.css b/LCARStrek/skin/LCARStrek/global/tree.css
index 49d279ae9b0ca8ffd4cfba540dc891f158241886..60c0b92871bba17c46b7b941598945e02baec4b0 100644 (file)
--- a/LCARStrek/skin/LCARStrek/global/tree.css
+++ b/LCARStrek/skin/LCARStrek/global/tree.css
@@ -7,9 +7,11 @@
  **/
 tree 
   {
+    -moz-border-radius    : 5px;
     background-color      : #000000;
-    border                : none;
+    border                : 1px solid #9C9CFF;
     border-spacing        : 0px;
+/*    margin                : 1px 3px 2px 3px; */
   }
 
 .tree-container-treerows[dragover="true"][dragdroptree="true"]
@@ -24,13 +26,6 @@ tree
   {
   }  
   
-tree.inset
-  {
-    -moz-border-radius    : 5px;
-    border                : 1px solid #9C9CFF;
-    margin                : 1px 3px 2px 3px;
-  }
-
 treeitem[selected="true"] > treerow
   {
     background-color      : #008484;
@@ -94,6 +89,11 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
     padding               : 0px 4px 0px 4px;
   }
 
+.treecell-header-text
+  {
+    margin                : 0px;
+  }
+
 .treecell-header-image-box 
   {
     padding               : 0px 1px 0px 1px;
@@ -246,7 +246,3 @@ treerow[mode="inline-edit"]
   {
     margin-left           : 0px;
   }
-
-
-
-

diff --git a/LCARStrek/skin/LCARStrek/messenger/addressbook/addressbook.css b/LCARStrek/skin/LCARStrek/messenger/addressbook/addressbook.css
index 740ec23a98a9c669adf2049250263019680ada51..53e78db3c9983c6185f2b40ba7928bb37ec69a9d 100644 (file)
--- a/LCARStrek/skin/LCARStrek/messenger/addressbook/addressbook.css
+++ b/LCARStrek/skin/LCARStrek/messenger/addressbook/addressbook.css
@@ -218,11 +218,9 @@ html|p {
 
 #dirTree, #resultsTree { 
   border: none;
+  margin: 0px;
 }
 
 #resultsTree {
 /*  border-left: 1px solid ThreeDShadow; */
 }
-
-
-

diff --git a/LCARStrek/skin/LCARStrek/messenger/messageHeader.css b/LCARStrek/skin/LCARStrek/messenger/messageHeader.css
index b1911148fa73b1e1107b2af3c34100e0fe5fdf97..d8a6a2e41d6afc59a31b9fe69891ca68c4f19abc 100644 (file)
--- a/LCARStrek/skin/LCARStrek/messenger/messageHeader.css
+++ b/LCARStrek/skin/LCARStrek/messenger/messageHeader.css
@@ -53,11 +53,6 @@ mail-toggle-headerfield
     padding-right         : 1px; 
   }
 
-mail-emailheaderfield > .headerBox > mail-emailaddress
-  { 
-    padding-left          : 0.5em; 
-  }
-
 .buttonTopSpacer     
   { 
     height                : 0.3em; 
@@ -111,7 +106,7 @@ mail-emailheaderfield > .headerBox > mail-emailaddress
     -moz-box-pack: end;
   }
 
-.emailDisplayButton 
+label.emailDisplayButton 
   {
     color                 : #008484;
     cursor                : pointer;
@@ -122,7 +117,7 @@ mail-emailheaderfield > .headerBox > mail-emailaddress
     padding-right         : 1px; 
   }
 
-.emailDisplayButton:hover
+label.emailDisplayButton:hover
   {
     color                 : black;
     background-color      : #FFCF00;
@@ -138,24 +133,12 @@ mail-emailheaderfield > .headerBox > mail-emailaddress
   list-style-image      : url("chrome://global/skin/twisty-open-selected.gif");
 }
 
-html.headerValue   
-  { 
-    white-space           : normal;
-    min-width             : 50px; 
-    margin                : 0px;
-  }
-
-html.subjectvalue  
-  { 
-    font-weight           : bold; 
-  }
-
-text.subjectvalue
+label.subjectvalue
  {
   font-weight             : bold;
  }
 
-text.headerdisplayname 
+label.headerdisplayname 
   { 
     font-weight           : bold; 
     margin-right          : 0.5em; 
@@ -163,7 +146,7 @@ text.headerdisplayname
     min-height: 16px;
   }
 
-text.headerValue 
+label.headerValue 
   { 
     white-space           : normal; 
     min-width             : 50px; 
@@ -210,7 +193,7 @@ text.headerValue
   width: 12em;
 }
 
-text.collapsedHeaderDisplayName 
+label.collapsedHeaderDisplayName 
 { 
   font-weight: bold; 
   margin-left: .7em;

diff --git a/LCARStrek/skin/LCARStrek/navigator/navigator.css b/LCARStrek/skin/LCARStrek/navigator/navigator.css
index bc334ce9f13caf44472d314beb92d0ea2aaa32e9..61c17347601c8badaf919c7579fe6cece125c5f4 100644 (file)
--- a/LCARStrek/skin/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/skin/LCARStrek/navigator/navigator.css
@@ -6,6 +6,8 @@
 @import url(chrome://navigator/skin/personalToolbar.css);
 @import url(chrome://communicator/skin/sidebar/sidebar.css);
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
 /********** resource bundle binding **********/
 
 #resource_bundle_navigator
@@ -18,14 +20,12 @@
   {
     border-left           : 1px solid ThreeDDarkShadow;
     border-top            : 1px solid ThreeDDarkShadow;
-    border-right          : 1px solid ThreeDFace;
     border-bottom         : 1px solid ThreeDFace;
   }
 
 #browser
   {
     border-left           : 1px solid ThreeDShadow;
-    border-right          : 1px solid ThreeDHighlight;
   }  
 */
 
@@ -244,7 +244,7 @@
 
 .autocomplete-outlinerbody:-moz-outliner-cell-text(comment) 
   {
-    font-style          : italic;
+/*    font-style          : italic; */
   }
 
 .autocomplete-history-button:hover