css scoping, false dimensions of <tree>s and urlbar space

diff --git a/LCARStrek/communicator/skin/box.css b/LCARStrek/communicator/skin/box.css
index 4e05111184db2e2f90e1ede70f123c6d7ed30709..8b137891791fe96927ad78e64b0aad7bded08bdc 100755 (executable)
--- a/LCARStrek/communicator/skin/box.css
+++ b/LCARStrek/communicator/skin/box.css
@@ -1,11 +1 @@
-/* hmm, could this box (hbox) be in any other component than navigator? */
-
-#urlbar-container
-  {
-    -moz-border-radius    : 5px 0px 0px 5px;
-    border                : 1px solid #9C9CFF;
-    background-color      : #000000;
-    padding               : 1px;
-    margin                : 0px 0px 0px 3px;
-  }

 
 

diff --git a/LCARStrek/communicator/skin/button.css b/LCARStrek/communicator/skin/button.css
index bdf7508d9685021e8e2badfed3e1027778042eb6..8c427ec98ae2a545afbf05dffeb951276452999c 100755 (executable)
--- a/LCARStrek/communicator/skin/button.css
+++ b/LCARStrek/communicator/skin/button.css
@@ -265,7 +265,7 @@
   
 menubutton.button-toolbar-4
   {
   
 menubutton.button-toolbar-4
   {

-    -moz-binding          : url("chrome://global/content/menulistBindings.xml#menubutton-single-right");
+    -moz-binding          : url("chrome://global/content/bindings/menubutton.xml#menubutton-single-right");

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


@@ -294,7 +294,3 @@ menubutton.button-toolbar-4
   {
     padding               : 2px 0px 0px 4px;
   }
   {
     padding               : 2px 0px 0px 4px;
   }

-
-
-
-

diff --git a/LCARStrek/communicator/skin/menubutton.css b/LCARStrek/communicator/skin/menubutton.css
index 1e047016e7049e19ebd1e768135d7a5fb49c2444..64679f4a2612f66acfc2b7bb84f759394a89d3e5 100755 (executable)
--- a/LCARStrek/communicator/skin/menubutton.css
+++ b/LCARStrek/communicator/skin/menubutton.css
@@ -115,13 +115,13 @@
 
 .menubutton-dual.top
   {
 
 .menubutton-dual.top
   {

-    -moz-binding          : url("chrome://global/content/menulistBindings.xml#menubutton-dual-ex");
+    -moz-binding          : url("chrome://global/content/bindings/menubutton.xml#menubutton-dual-ex");

 /*    -moz-user-focus       : ignore !important; */
   }
 
 .menubutton-dual.left
   {
 /*    -moz-user-focus       : ignore !important; */
   }
 
 .menubutton-dual.left
   {

-    -moz-binding          : url("chrome://global/content/menulistBindings.xml#menubutton-dual-ex-left");
+    -moz-binding          : url("chrome://global/content/bindings/menubutton.xml#menubutton-dual-ex-left");

 /*    -moz-user-focus       : none !important; */
   }  
   
 /*    -moz-user-focus       : none !important; */
   }  
   


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

-
-
-
-
-

diff --git a/LCARStrek/global/skin/autocomplete.css b/LCARStrek/global/skin/autocomplete.css
index 580a66b3e7ef2d24d2fa2ba728b28ee18b60dd23..2cd4087c1edecaea592159e305110eba9478ddae 100644 (file)
--- a/LCARStrek/global/skin/autocomplete.css
+++ b/LCARStrek/global/skin/autocomplete.css
@@ -5,6 +5,7 @@
 textbox[type="autocomplete"]
   {
     cursor              : default !important;
 textbox[type="autocomplete"]
   {
     cursor              : default !important;

+    -moz-border-radius  : 5px;

   }
 
 .textbox-input 
   }
 
 .textbox-input 


@@ -15,6 +16,7 @@ textbox[type="autocomplete"]
 .autocomplete-internal-box 
   {
     padding             : 0px !important;
 .autocomplete-internal-box 
   {
     padding             : 0px !important;

+    -moz-border-radius  : 5px;

   }
 
 .autocomplete-textbox-container
   }
 
 .autocomplete-textbox-container


@@ -27,31 +29,42 @@ textbox[type="autocomplete"]
 .autocomplete-history-button
   {
     -moz-binding        : url("chrome://global/skin/classicBindings.xml#autocomplete-history-button");
 .autocomplete-history-button
   {
     -moz-binding        : url("chrome://global/skin/classicBindings.xml#autocomplete-history-button");

-    border-top          : 1px solid -moz-Dialog;
-    border-right        : 1px solid ThreeDDarkShadow;
-    border-bottom       : 1px solid ThreeDDarkShadow;
-    border-left         : 1px solid ThreeDFace;
-    background-color    : ThreeDFace;
+    width               : 15px; 
+    min-height          : 15px; 
+    border              : none;
+    background-color    : black;

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

+    padding             : 0px;
+/*    margin              : 0px; */
+    margin                : 0px 0px 0px 0px;
+    -moz-border-radius    : 0px 5px 5px 0px;

   }
 
 .autocomplete-history-button > .autocomplete-history-button-internal-box 
   {
   }
 
 .autocomplete-history-button > .autocomplete-history-button-internal-box 
   {

-    border-top          : 1px solid ThreeDHighlight;
-    border-right        : 1px solid ThreeDShadow;
-    border-bottom       : 1px solid ThreeDShadow;
-    border-left         : 1px solid ThreeDHighlight;
+    -moz-border-radius    : 0px 5px 5px 0px;
+/*    border                : 1px solid #9C9CFF; */
+    border              : none;
+    border-left         : 1px solid #9C9CFF;

     padding             : 1px;
   }
 
     padding             : 1px;
   }
 

+.autocomplete-history-button:hover,
+.autocomplete-history-button[buttonover="true"]
+  {
+    background-color    : #FFCF00;
+    list-style-image    : url("chrome://global/skin/scroll-down-hover.gif");
+  }
+
+.autocomplete-history-button:hover:active,

 .autocomplete-history-button[open="true"]
   {
 .autocomplete-history-button[open="true"]
   {

-    border              : 1px solid ThreeDDarkShadow;
+    background-color    : #FF9F00;
+    list-style-image    : url("chrome://global/skin/scroll-down-hover.gif");

   }
 
 .autocomplete-history-button[open="true"] > .autocomplete-history-button-internal-box
   {
   }
 
 .autocomplete-history-button[open="true"] > .autocomplete-history-button-internal-box
   {

-    border              : 1px solid ThreeDFace;

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


@@ -60,8 +73,8 @@ textbox[type="autocomplete"]
 .autocomplete-result-popup,
 .autocomplete-history-popup
   {
 .autocomplete-result-popup,
 .autocomplete-history-popup
   {

-    border                 : 1px solid ThreeDDarkShadow !important;
-    background-color       : -moz-Field !important;
+    border                 : 1px solid FF9F00 !important;
+    background-color       : black !important;

   }
 
 .autocomplete-history-popup
   }
 
 .autocomplete-history-popup


@@ -92,3 +105,7 @@ textbox[type="autocomplete"]
   {
     color                  : HighlightText !important;
   }
   {
     color                  : HighlightText !important;
   }

+
+
+
+

diff --git a/LCARStrek/global/skin/box.css b/LCARStrek/global/skin/box.css
deleted file mode 100755 (executable)
index d933aca..0000000
--- a/LCARStrek/global/skin/box.css
+++ /dev/null
@@ -1,54 +0,0 @@
-
-titledbox
-  {
-    -moz-border-radius    : 5px;
-    border                : 2px groove #9C9CFF;
-    padding               : 7px !important;
-    margin                : 5px;
-  }
-
-label
-  {
-    margin                : 0px 40px 2px 6px;
-    padding               : 0px 3px 0px 3px;
-/*    background-color      : ThreeDFace; */
-  } 
-
-.titledbox-body
-  {
-    display               : block;
-    padding               : inherit;
-  }
-
-    
-/** box formatting **/
-  box[autostretch="never"]
-    {
-      vertical-align      : middle;
-    }
-    
-  box[autostretch="never"][valign="top"]
-    {
-      vertical-align      : top;
-    }
-    
-  box[autostretch="never"][valign="bottom"]
-    {
-      vertical-align      : bottom;
-    }
-    
-  box[autostretch="never"][halign="center"] 
-    {
-      text-align          : center;
-    }
-    
-  box[autostretch="never"][halign="right"]
-    {
-      text-align          : right;
-    }
-
-  row[autostretch="never"]
-    {
-      vertical-align      : middle;
-    }
-  

diff --git a/LCARStrek/global/skin/button.css b/LCARStrek/global/skin/button.css
index e25dadf14c21a7f39d5aa38bff9f0529e1500518..1964be03de87734f39b9e4c2946a273114c2d7ce 100755 (executable)
--- a/LCARStrek/global/skin/button.css
+++ b/LCARStrek/global/skin/button.css
@@ -1,177 +1,168 @@
-/* NEW WIDGET ANDING: <button> */\r
-\r
-/** Default Button Styles (apply to usage of <button> without \r
- *  any applied class).\r
- **/\r
-\r
-/* outer frame */\r
-  button \r
-    {\r
-      -moz-border-radius  : 3px;\r
-      border              : none;\r
-      margin              : 1px 5px 2px 5px;\r
-      background-color    : #000000;\r
-      color               : #FFCF00;\r
-    }\r
-  \r
-  button:hover,\r
-  button:hover:active \r
-    {\r
-      border              : none;\r
-      background-color    : #FFCF00;\r
-      color               : #000000;\r
-    }\r
-        \r
-  button[disabled="true"],\r
-  button[disabled="true"]:hover,\r
-  button[disabled="true"]:hover:active \r
-    {\r
-      border              : none;\r
-      background-color    : #000000;\r
-      color               : #8050B0;\r
-    }\r
-        \r
-/* internal frame */\r
-  button > .button-internal-box \r
-    {\r
-      -moz-border-radius  : 3px;\r
-      vertical-align      : middle;\r
-      text-align          : center;\r
-      border              : none;\r
-      padding             : 1px;\r
-    }\r
-    \r
-  button:hover:active > .button-internal-box \r
-    {\r
-      border              : none;\r
-      padding             : 2px 0px 0px 2px;\r
-    }\r
-  \r
-  button[disabled="true"] > .button-internal-box,\r
-  button[disabled="true"]:hover > .button-internal-box,\r
-  button[disabled="true"]:hover:active > .button-internal-box \r
-    {\r
-      border              : none;\r
-      padding             : 1px;\r
-    }\r
-\r
-/* text wrapping frame (hack because <text> does not support alignment) */\r
-  .button-text-container\r
-    {\r
-      text-align          : center;\r
-      vertical-align      : middle;\r
-    }\r
-\r
-/* text frame */\r
-  .button-text \r
-    {\r
-      padding             : 1px 2px 1px 2px;\r
-    }\r
-  \r
-  button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text\r
-    {\r
-      padding             : 2px 2px 1px 2px;\r
-    }\r
-  \r
-/** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. \r
- *  To activate, set 'default' attribute on button.\r
- **/\r
- \r
-/* outer frame */  \r
-  button[default] \r
-    {\r
-      /* XXX this is a HACK until 'orient' is supported in CSS! XXX */\r
-      /* strictly speaking not necessary because default for buttonright is \r
-       * to lay image out horizontally, but leaving here as a reminder to\r
-       * implement this feature */\r
-      -moz-binding        : url(chrome://global/content/xulBindings.xml#buttonright);\r
-      font-weight         : bold;\r
-           list-style-image    : url("chrome://global/skin/return.gif");\r
-    }\r
-  \r
-  button[default]:hover\r
-    {\r
-    list-style-image    : url("chrome://global/skin/return-hover.gif");\r
-    }\r
-\r
-  button[default][disabled="true"]\r
-    {\r
-      list-style-image    : url("chrome://global/skin/return-disabled.gif");\r
-    }\r
-    \r
-/** Styles for 'dialog' buttons (usually any command button in a dialog)\r
- *  This class gives buttons 10px of padding on each side to increase the\r
- *  strike area and make buttons with small amounts of text (e.g. 'OK') \r
- *  look less silly.\r
- **/\r
-\r
-/* internal frame */\r
-  .button-dialog > .button-internal-box,\r
-  .button-dialog:hover > .button-internal-box\r
-    {\r
-      padding             : 2px 10px 2px 10px;\r
-    }\r
-  \r
-  .button-dialog:hover:hover:active > .button-internal-box \r
-    {\r
-      padding             : 3px 9px 1px 11px;\r
-    }\r
-\r
-/** Styles for grey toolbar buttons. These buttons are used in places like\r
- *  editor's formatting toolbar or toolbars wanting a button similar to a command\r
- *  button but without an initial outset frame.\r
- **/ \r
-  .button-borderless \r
-    {\r
-      border              : none;\r
-    }\r
-  \r
-  .button-borderless:hover\r
-    {\r
-      border              : none;\r
-    }\r
-    \r
-  .button-borderless > .button-internal-box \r
-    {\r
-      border              : none;\r
-    }\r
-  \r
-  .button-borderless:hover > .button-internal-box \r
-    {\r
-      border              : none;\r
-    }\r
-  \r
-  .button-borderless:hover:active > .button-internal-box \r
-    {\r
-      border              : none;\r
-    }\r
-\r
-/** plain (raw) buttons, class="plain" **/\r
-\r
-  button.plain, button.plain:hover, button.plain:hover:active,\r
-  button.plain > .button-internal-box, \r
-  button.plain:hover:active > .button-internal-box,\r
-  button.plain > .button-internal-box:hover:active,\r
-  button.plain > .button-internal-box > .button-text-container, \r
-  button.plain > .button-internal-box > .button-text-container:hover:active,\r
-  button.plain > .button-internal-box > .button-text-container > .button-text, \r
-  button.plain > .button-internal-box > .button-text-container > .button.text:hover:active,\r
-  button-plain > .button-internal-box > .button-icon, \r
-  button.plain > .button-internal-box > .button.icon:hover:active\r
-    {\r
-      border              : 0px;\r
-      margin              : 0px;\r
-      padding             : 0px;\r
-    }\r
-\r
-\r
-/** \r
- * utility class for buttons with associated popup\r
- **/\r
-.button-popup \r
-  {\r
-         list-style-image      : url(chrome://global/skin/taskbar-popup-arrow.gif);\r
-  }\r
-    \r
-    \r
-    
\ No newline at end of file
+/* NEW WIDGET ANDING: <button> */
+
+/** Default Button Styles (apply to usage of <button> without 
+ *  any applied class).
+ **/
+
+/* outer frame */
+  button 
+    {
+      -moz-border-radius  : 3px;
+      border              : none;
+      margin              : 1px 5px 2px 5px;
+      background-color    : #000000;
+      color               : #FFCF00;
+    }
+  
+  button:hover,
+  button:hover:active 
+    {
+      border              : none;
+      background-color    : #FFCF00;
+      color               : #000000;
+    }
+        
+  button[disabled="true"],
+  button[disabled="true"]:hover,
+  button[disabled="true"]:hover:active 
+    {
+      border              : none;
+      background-color    : #000000;
+      color               : #8050B0;
+    }
+        
+/* internal frame */
+  button > .button-internal-box 
+    {
+      -moz-border-radius  : 3px;
+      vertical-align      : middle;
+      text-align          : center;
+      border              : none;
+      padding             : 1px;
+    }
+    
+  button:hover:active > .button-internal-box 
+    {
+      border              : none;
+      padding             : 2px 0px 0px 2px;
+    }
+  
+  button[disabled="true"] > .button-internal-box,
+  button[disabled="true"]:hover > .button-internal-box,
+  button[disabled="true"]:hover:active > .button-internal-box 
+    {
+      border              : none;
+      padding             : 1px;
+    }
+
+/* text wrapping frame (hack because <text> does not support alignment) */
+  .button-text-container
+    {
+      text-align          : center;
+      vertical-align      : middle;
+    }
+
+/* text frame */
+  .button-text 
+    {
+      padding             : 1px 2px 1px 2px;
+    }
+  
+  button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text
+    {
+      padding             : 2px 2px 1px 2px;
+    }
+  
+/** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. 
+ *  To activate, set 'default' attribute on button.
+ **/
+ 
+/* outer frame */  
+  button[default] 
+    {
+      list-style-image    : url("chrome://global/skin/return.gif");
+    }
+  
+  button[default]:hover
+    {
+    list-style-image    : url("chrome://global/skin/return-hover.gif");
+    }
+
+  button[default][disabled="true"]
+    {
+      list-style-image    : url("chrome://global/skin/return-disabled.gif");
+    }
+    
+/** Styles for 'dialog' buttons (usually any command button in a dialog)
+ *  This class gives buttons 10px of padding on each side to increase the
+ *  strike area and make buttons with small amounts of text (e.g. 'OK') 
+ *  look less silly.
+ **/
+
+/* internal frame */
+  .button-dialog > .button-internal-box,
+  .button-dialog:hover > .button-internal-box
+    {
+      padding             : 2px 10px 2px 10px;
+    }
+  
+  .button-dialog:hover:hover:active > .button-internal-box 
+    {
+      padding             : 3px 9px 1px 11px;
+    }
+
+/** Styles for grey toolbar buttons. These buttons are used in places like
+ *  editor's formatting toolbar or toolbars wanting a button similar to a command
+ *  button but without an initial outset frame.
+ **/ 
+  .button-borderless 
+    {
+      border              : none;
+    }
+  
+  .button-borderless:hover
+    {
+      border              : none;
+    }
+    
+  .button-borderless > .button-internal-box 
+    {
+      border              : none;
+    }
+  
+  .button-borderless:hover > .button-internal-box 
+    {
+      border              : none;
+    }
+  
+  .button-borderless:hover:active > .button-internal-box 
+    {
+      border              : none;
+    }
+
+/** plain (raw) buttons, class="plain" **/
+
+  button.plain, button.plain:hover, button.plain:hover:active,
+  button.plain > .button-internal-box, 
+  button.plain:hover:active > .button-internal-box,
+  button.plain > .button-internal-box:hover:active,
+  button.plain > .button-internal-box > .button-text-container, 
+  button.plain > .button-internal-box > .button-text-container:hover:active,
+  button.plain > .button-internal-box > .button-text-container > .button-text, 
+  button.plain > .button-internal-box > .button-text-container > .button.text:hover:active,
+  button-plain > .button-internal-box > .button-icon, 
+  button.plain > .button-internal-box > .button.icon:hover:active
+    {
+      border              : 0px;
+      margin              : 0px;
+      padding             : 0px;
+    }
+
+
+/** 
+ * utility class for buttons with associated popup
+ **/
+.button-popup 
+  {
+         list-style-image      : url(chrome://global/skin/taskbar-popup-arrow.gif);
+  }

diff --git a/LCARStrek/global/skin/buttonBindings.xml b/LCARStrek/global/skin/buttonBindings.xml
index 24292539ea061537d1b00a1a79279a4ca5b833ae..e91fbf31a652e67e5c698981a9a8e5bb6383c723 100755 (executable)
--- a/LCARStrek/global/skin/buttonBindings.xml
+++ b/LCARStrek/global/skin/buttonBindings.xml
@@ -4,7 +4,7 @@
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 

-  <binding id="buttonleft" extends="chrome://global/content/xulBindings.xml#basetext">
+  <binding id="buttonleft" extends="chrome://global/content/bindings/button.xml#button-base">

     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1">
     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1">


@@ -17,7 +17,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

-  <binding id="buttonright" extends="chrome://global/content/xulBindings.xml#basetext">
+  <binding id="buttonright" extends="chrome://global/content/bindings/button.xml#button-base">

     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1">
     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1">


@@ -30,7 +30,7 @@
     </content>
   </binding>
   
     </content>
   </binding>
   

-  <binding id="buttontop" extends="chrome://global/content/xulBindings.xml#basetext">
+  <binding id="buttontop" extends="chrome://global/content/bindings/button.xml#button-base">

     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">


@@ -43,7 +43,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

-  <binding id="buttonbottom" extends="chrome://global/content/xulBindings.xml#basetext">
+  <binding id="buttonbottom" extends="chrome://global/content/bindings/button.xml#button-base">

     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
     <content excludes="observes,template">
       <xul:box class="button-box-1" autostretch="never" flex="1">
         <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">

diff --git a/LCARStrek/global/skin/classicBindings.xml b/LCARStrek/global/skin/classicBindings.xml
index bbe3bf086fe5a0e1a7d6d383dfb2325187749d54..7db5cb50f7aba672c68d24248dac1296db23ffde 100755 (executable)
--- a/LCARStrek/global/skin/classicBindings.xml
+++ b/LCARStrek/global/skin/classicBindings.xml
@@ -13,7 +13,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

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

     <content orient="vertical">
       <xul:box autostretch="never" halign="center">
         <xul:image class="toolbargrippy-twisty"/>
     <content orient="vertical">
       <xul:box autostretch="never" halign="center">
         <xul:image class="toolbargrippy-twisty"/>


@@ -22,7 +22,17 @@
     </content>
   </binding>
   
     </content>
   </binding>
   

-  <binding id="radio" extends="chrome://global/content/radioBindings.xml#radio">
+  <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
+    <content>
+      <xul:box autostretch="never" halign="center">
+        <xul:image class="toolbargrippy-twisty-collapsed"/>
+      </xul:box>
+      <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
+    </content>
+  </binding>
+
+
+  <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 class="radio-checkmark-box-1" autostretch="never" inherits="disabled">
     <content excludes="observes">
       <xul:box flex="1" class="radio-internal-box" autostretch="never" valign="middle">
         <xul:box class="radio-checkmark-box-1" autostretch="never" inherits="disabled">


@@ -38,7 +48,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

-  <binding id="checkbox" extends="chrome://global/content/xulBindings.xml#checkbox">
+  <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 class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">
     <content excludes="observes">
       <xul:box flex="1" class="checkbox-internal-box" autostretch="never" valign="middle">
         <xul:box class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">


@@ -54,7 +64,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

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

     <content>
       <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
         <xul:spring flex="1"/>
     <content>
       <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
         <xul:spring flex="1"/>


@@ -62,7 +72,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

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

     <content>
       <xul:scrollbarbutton type="decrement" inherits="align:sborient"/>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
     <content>
       <xul:scrollbarbutton type="decrement" inherits="align:sborient"/>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">


@@ -80,13 +90,13 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

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

     <content>
            <xul:button class="slider-button"/>
        </content>
   </binding>
   
     <content>
            <xul:button class="slider-button"/>
        </content>
   </binding>
   

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

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


@@ -103,4 +113,3 @@
   </binding>
   
 </bindings>
   </binding>
   
 </bindings>

-

diff --git a/LCARStrek/global/skin/formatting.css b/LCARStrek/global/skin/formatting.css
index efdd489f2c5284a074a0288d5efe3cefd6902a04..85c2123250aa8e60a64ee3daf7ade9d3f0d10ba9 100755 (executable)
--- a/LCARStrek/global/skin/formatting.css
+++ b/LCARStrek/global/skin/formatting.css
@@ -111,7 +111,7 @@
     
   html
     {
     
   html
     {

-      margin              : 1px 5px 4px 5px;
+/*      margin              : 1px 5px 4px 5px; */

       cursor              : default;
     }
 
       cursor              : default;
     }
 


@@ -148,4 +148,3 @@
       -moz-user-select    : text;
       text-decoration     : underline;
     }
       -moz-user-select    : text;
       text-decoration     : underline;
     }

-

diff --git a/LCARStrek/global/skin/global.css b/LCARStrek/global/skin/global.css
index fe6b4f02c688cf52bb866a5be4ed53e92f5c672c..9834278322a7c664c57c1507eea2cb13c3eb34cd 100755 (executable)
--- a/LCARStrek/global/skin/global.css
+++ b/LCARStrek/global/skin/global.css
@@ -11,25 +11,40 @@
 /* all localizable skin settings shall live here */
 @import url(chrome://global/locale/intl.css);
 
 /* all localizable skin settings shall live here */
 @import url(chrome://global/locale/intl.css);
 

-@import url(chrome://global/skin/box.css);
-@import url(chrome://global/skin/button.css);
-@import url(chrome://global/skin/checkbox.css);
-@import url(chrome://global/skin/radio.css);
-@import url(chrome://global/skin/tree.css);
-@import url(chrome://global/skin/outliner.css);
-@import url(chrome://global/skin/splitter.css);
-@import url(chrome://global/skin/radio.css);
-@import url(chrome://global/skin/menubutton.css);
-@import url(chrome://global/skin/menulist.css);
-@import url(chrome://global/skin/menu.css);
-@import url(chrome://global/skin/formatting.css);
-@import url(chrome://global/skin/textfield.css);
-@import url(chrome://global/skin/tabcontrol.css);
-@import url(chrome://global/skin/toolbar.css);
-@import url(chrome://global/skin/colorpicker.css);
+@import url("chrome://global/skin/formatting.css");
+/*
+@import url("chrome://global/content/bindings/outliner.css");
+@import url("chrome://global/content/bindings/popup.css");
+@import url("chrome://global/content/bindings/scrollbar.css");
+@import url("chrome://global/content/bindings/tree.css");
+
+@import url("chrome://global/skin/button.css");
+@import url("chrome://global/skin/checkbox.css");
+@import url("chrome://global/skin/colorpicker.css");
+@import url("chrome://global/skin/menu.css");
+@import url("chrome://global/skin/menubutton.css");
+@import url("chrome://global/skin/menulist.css");
+@import url("chrome://global/skin/outliner.css");
+@import url("chrome://global/skin/popup.css");
+@import url("chrome://global/skin/progressmeter.css");
+@import url("chrome://global/skin/radio.css");
+@import url("chrome://global/skin/scrollbox.css");
+@import url("chrome://global/skin/splitter.css");
+@import url("chrome://global/skin/tabcontrol.css");
+@import url("chrome://global/skin/textbox.css");
+@import url("chrome://global/skin/toolbar.css");
+@import url("chrome://global/skin/tree.css");
+*/

 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 

-@namespace html url("http://www.w3.org/1999/xhtml"); 
+
+
+/**  
+ * bindings
+ **/
+
+/* LCARStrek does currently not need any bindings here, if we once do, see sample in Classic */
+

 
 /**
  * XXX-DEBUG: HTML namespace/titledbutton striping. 
 
 /**
  * XXX-DEBUG: HTML namespace/titledbutton striping. 


@@ -158,9 +173,9 @@
 
 
 /**
 
 
 /**

- * html|iframe default sizing 
+ * iframe default sizing 

  **/
  **/

-  html|iframe 
+  iframe 

     {
       min-width           : 10px;
       min-height          : 10px;
     {
       min-width           : 10px;
       min-height          : 10px;


@@ -169,74 +184,7 @@
       border              : none;
     }
 
       border              : none;
     }
 

-/** 
- * XUL <progressmeter> 
- **/
-  progressmeter[mode="undetermined"] > .progressmeter-internal-box
-    {
-      background-image    : url(chrome://global/skin/progressmeter-busy.gif);
-    }
- 
-  progressmeter[mode="undetermined"] > .progressmeter-internal-box > .progressmeter-stack > .progressmeter-progressbar {
-      visibility: collapse;
+.tooltip-label
+  {
+    margin                : 0px;

   }
   }

-
-  .progress-text 
-    {
-      font-weight         : normal !important;
-    }
-  
-  progressmeter 
-    {
-      min-width           : 100px;
-      margin              : 0px 4px 0px 4px;
-      border              : 1px solid #FF9F00;
-    }
-
-  progressmeter > .progressmeter-internal-box 
-    {
-      border              : none;
-      padding             : 1px;
-/*      border              : 1px solid #000000; */
-    }
-
-/* progress indicators */
-  .progress-bar 
-    {
-           background-color    : #FFCF00;
-    }
-  
-  .progress-remainder 
-    {
-           background-color    : #000000;
-    }
-
-  .progressmeter-statusbar 
-    {
-      border              : 1px solid #FF9F00;
-      margin              : 1px 4px 1px 4px;
-    }
-
-  .progressmeter-statusbar > .progressmeter-internal-box
-    {
-      border              : none;
-      padding             : 1px;
-    }
-    
-  .progressmeter-progressbar[statusbar="true"] > .progress-bar
-    {
-      background-color    : #FFCF00;
-      border-right        : none;
-    }
-   
-  .progressmeter-progressbar[statusbar="true"] > .progress-remainder
-    {
-      background-color    : #000000;
-    }
-    
-/** XUL <scrollbar> element **/
-  scrollbar 
-    { 
-      -moz-user-focus          : ignore; 
-    } 
-

diff --git a/LCARStrek/global/skin/menu.css b/LCARStrek/global/skin/menu.css
index 60eb918ccda892538a6539bd9f3b34aefa35b6f2..0dd24dbc9944aac8c32bb524460f8eadcfa8c2a5 100755 (executable)
--- a/LCARStrek/global/skin/menu.css
+++ b/LCARStrek/global/skin/menu.css
@@ -1,32 +1,3 @@
- 
-menubar 
-  {
-    border-bottom         : 3px solid #000000;
-  }
-
-menubar > .toolbar-holder
-  {
-    /* max-height is only important as long as we need to workaround bug 24998... */
-    max-height            : 17px;
-    padding-right         : 18px;
-    background-color      : #6000CF;
-    background-image      : url("chrome://global/skin/menubar-endcap.gif");
-    background-repeat     : no-repeat;
-    background-position   : right;
-
-/* THE FOLLOWING LINES ARE NOT WORKING THOUGH THEY SHOULD!  BUG 24998  */
-/*    -moz-border-radius    : 0px 10px 10px 0px;
-    background-image      : url("chrome://global/skin/toolbar-bg.gif");
-    background-repeat     : repeat-y;
-    background-position   : right;
-*/
-  }
-
-menubar > toolbargrippy 
-  {
-/*    display               : none; */
-  }
-

 menu, menuitem  
   {
     background-color      : #000000;
 menu, menuitem  
   {
     background-color      : #000000;


@@ -46,23 +17,14 @@ menuitem[menuactive="true"][disabled="true"]
          color                 : #8050B0;
   }
 
          color                 : #8050B0;
   }
 

-/* XXX menupopups have to have a color explicitly specified. this is a bug */
-menupopup, popup 
+menupopup > menu,
+menupopup > menuitem,
+popup > menu,
+popup > menuitem

   {
   {

-    background-color      : #000000;
-    color                 : #FF9F00;
-    border                : 1px solid #FF9F00;
-  }
-
-menupopup > menu, popup > menu,
-menupopup > menuitem, popup > menuitem
-  {
-    max-width             : 250px;
-    min-width             : 125px;
-    margin-left           : 0px;
-    margin-right          : 0px;
-    margin-top            : 0px;
-    margin-bottom         : 0px;
+    -moz-border-radius    : 0px;
+    max-width             : 42em; /* should move to content */
+    margin                : 0px;

   }
 
 menuseparator 
   }
 
 menuseparator 


@@ -79,13 +41,6 @@ menubar > menu
     margin                : 0px 2px 0px 2px;
   }
 
     margin                : 0px 2px 0px 2px;
   }
 

-menupopup > menu, menupopup > menuitem,
-popup > menu, popup > menuitem
-  {
-    -moz-border-radius    : 0px;
-    padding               : 2px;
-  }
-

 menubar > menu[menuactive="true"] 
   {
     background-color      : #FFCF00;
 menubar > menu[menuactive="true"] 
   {
     background-color      : #FFCF00;


@@ -157,21 +112,24 @@ popup > menuitem[menuactive="true"]
     margin                : 0px 2px 0px 0px;
   }
 
     margin                : 0px 2px 0px 0px;
   }
 

+.menu-iconic-text
+  {
+    margin                : 2px 2px 2px 0px;
+  }
+

 .menu-text 
   {
 .menu-text 
   {

-    padding-left          : 15px;
-    font-weight           : inherit;
+    margin                : 2px 2px 2px 23px;

   }
 
 .menu-accel 
   {
   }
 
 .menu-accel 
   {

-    margin-left           : 4px;
-    padding-right         : 14px;
+    margin                : 2px 14px 2px 6px;

   }
 
 .menu-iconic-accel 
   {
   }
 
 .menu-iconic-accel 
   {

-    margin-left           : 4px;
+    margin                : 2px 14px 2px 4px;

   }
 
 .menubar-text 
   }
 
 .menubar-text 


@@ -185,14 +143,29 @@ menuitem[checked="true"]
     list-style-image      : url("chrome://global/skin/menu-check.gif");
   }
 
     list-style-image      : url("chrome://global/skin/menu-check.gif");
   }
 

+menuitem[checked="true"][menuactive="true"]
+  {
+    list-style-image      : url("chrome://global/skin/menu-check-hover.gif");
+  }
+

 menuitem[checked="true"][disabled="true"] 
   {
     list-style-image      : url("chrome://global/skin/menu-check-disabled.gif");
   }
 
 menuitem[checked="true"][disabled="true"] 
   {
     list-style-image      : url("chrome://global/skin/menu-check-disabled.gif");
   }
 

-menuitem[checked="true"][menuactive="true"] 
+menuitem[checked="true"][type="radio"] 

   {
   {

-    list-style-image      : url("chrome://global/skin/menu-check-hover.gif");
+    list-style-image      : url("chrome://global/skin/menu-radio.gif");
+  }
+
+menuitem[checked="true"][type="radio"][disabled="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-radio-disabled.gif");
+  }
+
+menuitem[checked="true"][type="radio"][menuactive="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-radio-hover.gif");

   }
 
 /** Tooltips (tooltip <popup> element)
   }
 
 /** Tooltips (tooltip <popup> element)


@@ -215,23 +188,46 @@ html#TOOLTIP-tooltipText
     margin                : 0px;
   }
 
     margin                : 0px;
   }
 

-/*
- * Autorepeatbutton
- */
-.autorepeatbutton-up {
-    list-style-image: url("chrome://global/skin/scroll-up.gif")
-}
-
-.autorepeatbutton-down {
-    list-style-image: url("chrome://global/skin/scroll-down.gif")
-}
-
-autorepeatbutton {
-  text-align: center;
-  vertical-align: middle;
-}
-
-autorepeatbutton:hover {
-  background-color: #FFCF00;
-}
-
+/* ::::: autocomplete menuitems ::::: */
+
+.autocomplete-history-popup > menuitem
+  {
+    max-width              : none !important;
+    font-size              : smaller;
+  }
+
+/* ::::: menu/menuitems in a menulist popup ::::: */
+
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu
+    {
+      padding             : 0px 4px !important;
+      min-width           : 0px;  /* should be in content*/
+      max-width           : none; /* should be in content*/
+    }
+
+  menulist > menupopup > menuitem > .menu-iconic-accel,
+  menulist > menupopup > menuitem > .menu-accel,
+  menulist > menupopup > menuitem > .menu-text,
+  menulist > menupopup > menuitem > .menu-iconic-text,
+  menulist > menupopup > menu > .menu-text,
+  menulist > menupopup > menu > .menu-accel,
+  menulist > menupopup > menu > .menu-iconic-text,
+  menulist > menupopup > menu > .menu-iconic-accel
+    {
+      margin-top          : 0px;
+      margin-bottom       : 0px;
+    }
+
+  menulist > menupopup > menuitem[selected="true"]
+    {
+      border              : 1px dotted #F5DB95;
+    }
+
+  menulist > menupopup > menuitem > .menu-iconic-left,
+  menulist > menupopup > menuitem > .menu-iconic-left[menuactive="true"]
+    {
+      list-style-image    : inherit;
+      width               : 0px;
+      border              : none;
+    }

diff --git a/LCARStrek/global/skin/menulist.css b/LCARStrek/global/skin/menulist.css
index c59169a2965c4a4ba50a55cf6275df40acd0faac..0bb7d691ee7c4b7bbbc974d91f94c29ef4f8b565 100755 (executable)
--- a/LCARStrek/global/skin/menulist.css
+++ b/LCARStrek/global/skin/menulist.css
@@ -1,191 +1,156 @@
-\r
-/* NEW WIDGET LANDING: <menulist> popup */\r
-\r
-/* outer frame */\r
-  menulist \r
-    {\r
-      -moz-border-radius  : 3px;\r
-      padding             : 0px;\r
-      border              : none;\r
-      background-color    : #000000;\r
-      color               : #E7ADE7;\r
-      margin              : 1px 5px 2px 5px;\r
-    }\r
-\r
-  menulist[menuactive="true"],\r
-  menulist:hover \r
-    {\r
-      background-color    : #FFCF00;\r
-      color               : #000000;\r
-      border              : none;\r
-    }\r
-\r
-  menulist[open="true"] \r
-    {\r
-      background-color    : #FF9F00;\r
-      color               : #000000;\r
-      border              : none;\r
-    }\r
-  \r
-  menulist[disabled="true"]\r
-    {\r
-      border              : none;\r
-      color               : #8050B0;\r
-    }\r
-    \r
-/* icon display frame */\r
-  menulist > .menu-icon \r
-    {\r
-      -moz-border-radius  : 3px 0px 0px 3px;\r
-      border-left         : 1px solid #9C9CFF;\r
-      border-top          : 1px solid #9C9CFF;\r
-      border-bottom       : 1px solid #9C9CFF;\r
-      padding             : 2px 0px 2px 0px;\r
-    }  \r
-\r
-  menulist[open="true"] > .menu-icon \r
-    {\r
-      border-left         : 1px solid #FFCF00;\r
-      border-top          : 1px solid #FFCF00;\r
-      border-bottom       : 1px solid #FFCF00;\r
-      padding             : 2px 0px 2px 0px;\r
-    }\r
-  \r
-  menulist[disabled="true"] > .menu-icon \r
-    {\r
-      border-left         : 1px solid #8050B0;\r
-      border-top          : 1px solid #8050B0;\r
-      border-bottom       : 1px solid #8050B0;\r
-    }\r
-  \r
-/* text display frame */\r
-  menulist > .menu-text \r
-    {\r
-      padding             : 2px 4px 2px 4px;\r
-      border-top          : 1px solid #9C9CFF;\r
-      border-bottom       : 1px solid #9C9CFF;\r
-      border-right        : 1px solid #9C9CFF;\r
-      margin-right        : 0px;\r
-    }\r
-    \r
-  menulist[open="true"] > .menu-text \r
-    {\r
-      border-top          : 1px solid #FFCF00;\r
-      border-bottom       : 1px solid #FFCF00;\r
-      border-right        : 1px solid #FFCF00;\r
-      padding             : 2px 4px 2px 4px;\r
-    }\r
-\r
-  menulist[disabled="true"] > .menu-text \r
-    {\r
-      border-top          : 1px solid #8050B0;\r
-      border-bottom       : 1px solid #8050B0;\r
-      border-right        : 1px solid #8050B0;\r
-      padding             : 2px 4px 2px 4px;\r
-    }\r
-\r
-/* drop marker display frame */\r
-  menulist > .menu-dropmarker \r
-    {\r
-      -moz-border-radius  : 0px 3px 3px 0px;\r
-      border              : 1px solid #9C9CFF;\r
-      border-left         : none;\r
-      list-style-image    : url("chrome://global/skin/scroll-down.gif");\r
-      padding             : 2px;\r
-    }\r
-  \r
-  menulist:hover > .menu-dropmarker, \r
-  menulist[open="true"] > .menu-dropmarker \r
-    {\r
-      list-style-image    : url("chrome://global/skin/scroll-down-hover.gif");\r
-    }\r
-  \r
-  menulist[disabled="true"] > .menu-dropmarker\r
-    {\r
-      border              : 1px solid #8050B0;\r
-      list-style-image    : url("chrome://global/skin/scroll-down-disabled.gif");\r
-    }\r
-\r
-  menulist[open="true"] > .menu-dropmarker \r
-    {\r
-      border              : 1px solid #FFCF00;\r
-      padding             : 3px 2px 1px 2px;\r
-    }\r
-\r
-/** rules for EDITABLE menulists (aka 'comboboxes'). \r
- **/\r
-\r
-/* outer frame */\r
-  menulist[editable="true"] \r
-    {\r
-      padding             : 0px;\r
-    }\r
-\r
-/* icon display frame */\r
-  menulist[editable="true"] > .menu-icon \r
-    {\r
-      list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");\r
-      background-color    : white;\r
-      padding             : 1px;\r
-      border-left         : 1px solid #9C9CFF;\r
-      border-top          : 1px solid #9C9CFF;\r
-      border-right        : none;\r
-      border-bottom       : 1px solid #9C9CFF;\r
-    }\r
-\r
-/* text display frame */    \r
-  menulist[editable="true"] > .menu-text \r
-    {\r
-      border-left         : none;\r
-      border-top          : 1px solid #9C9CFF;\r
-      border-right        : 1px solid #9C9CFF;\r
-      border-bottom       : 1px solid #9C9CFF;\r
-      margin              : 0px 2px 0px 0px;\r
-    }\r
-\r
-/* drop marker display frame */\r
-  menulist[editable="true"] > .menu-dropmarker \r
-    {\r
-      border              : 1px solid #9C9CFF;\r
-    }\r
-\r
-  menulist[editable="true"][open="true"] > .menu-dropmarker \r
-    {\r
-      border              : 1px solid #FFCF00;\r
-    }\r
-\r
-/* rules for popups and separators associated with menulists */\r
-/*\r
-  menulist > menupopup \r
-    {\r
-      border              : 1px solid #FF9F00;\r
-      min-width           : 0px;\r
-      padding             : 0px;\r
-    }\r
-    \r
-  menulist > menupopup > menuseparator \r
-    {\r
-     border-bottom       : 1px solid #FF9F00;\r
-    }\r
-*/\r
-  menulist > menupopup > menuitem \r
-    {\r
-      padding             : 0px;\r
-      min-width: 0px;\r
-      max-width: auto;\r
-    }\r
-\r
-  menulist > menupopup > menuitem > .menu-left \r
-    {\r
-      width               : 13px;\r
-    }\r
-\r
-  menulist > menupopup > menuitem[selected="true"] > .menu-left\r
-    {\r
-      list-style-image    : url(chrome://global/skin/menu-check.gif);\r
-    }\r
-  \r
-  menulist > menupopup > menuitem[menuactive="true"][selected="true"] > .menu-left\r
-    {\r
-      list-style-image    : url(chrome://global/skin/menu-check-hover.gif);\r
-    }\r
+
+/* NEW WIDGET LANDING: <menulist> popup */
+
+/* outer frame */
+  menulist 
+    {
+      -moz-border-radius  : 3px;
+      padding             : 0px;
+      border              : none;
+      background-color    : #000000;
+      color               : #E7ADE7;
+      margin              : 1px 5px 2px 5px;
+    }
+
+  menulist[menuactive="true"],
+  menulist:hover 
+    {
+      background-color    : #FFCF00;
+      color               : #000000;
+      border              : none;
+    }
+
+  menulist[open="true"] 
+    {
+      background-color    : #FF9F00;
+      color               : #000000;
+      border              : none;
+    }
+  
+  menulist[disabled="true"]
+    {
+      border              : none;
+      color               : #8050B0;
+    }
+    
+/* icon display frame */
+  menulist > .menu-icon 
+    {
+      -moz-border-radius  : 3px 0px 0px 3px;
+      border-left         : 1px solid #9C9CFF;
+      border-top          : 1px solid #9C9CFF;
+      border-bottom       : 1px solid #9C9CFF;
+      padding             : 2px 0px 2px 0px;
+    }  
+
+  menulist[open="true"] > .menu-icon 
+    {
+      border-left         : 1px solid #FFCF00;
+      border-top          : 1px solid #FFCF00;
+      border-bottom       : 1px solid #FFCF00;
+      padding             : 2px 0px 2px 0px;
+    }
+  
+  menulist[disabled="true"] > .menu-icon 
+    {
+      border-left         : 1px solid #8050B0;
+      border-top          : 1px solid #8050B0;
+      border-bottom       : 1px solid #8050B0;
+    }
+  
+/* text display frame */
+  menulist > .menu-text 
+    {
+      padding             : 2px 4px 2px 4px;
+      border-top          : 1px solid #9C9CFF;
+      border-bottom       : 1px solid #9C9CFF;
+      border-right        : 1px solid #9C9CFF;
+      margin-right        : 0px;
+    }
+    
+  menulist[open="true"] > .menu-text 
+    {
+      border-top          : 1px solid #FFCF00;
+      border-bottom       : 1px solid #FFCF00;
+      border-right        : 1px solid #FFCF00;
+      padding             : 2px 4px 2px 4px;
+    }
+
+  menulist[disabled="true"] > .menu-text 
+    {
+      border-top          : 1px solid #8050B0;
+      border-bottom       : 1px solid #8050B0;
+      border-right        : 1px solid #8050B0;
+      padding             : 2px 4px 2px 4px;
+    }
+
+/* drop marker display frame */
+  menulist > .menu-dropmarker 
+    {
+      -moz-border-radius  : 0px 3px 3px 0px;
+      border              : 1px solid #9C9CFF;
+      border-left         : none;
+      list-style-image    : url("chrome://global/skin/scroll-down.gif");
+      padding             : 2px;
+    }
+  
+  menulist:hover > .menu-dropmarker, 
+  menulist[open="true"] > .menu-dropmarker 
+    {
+      list-style-image    : url("chrome://global/skin/scroll-down-hover.gif");
+    }
+  
+  menulist[disabled="true"] > .menu-dropmarker
+    {
+      border              : 1px solid #8050B0;
+      list-style-image    : url("chrome://global/skin/scroll-down-disabled.gif");
+    }
+
+  menulist[open="true"] > .menu-dropmarker 
+    {
+      border              : 1px solid #FFCF00;
+      padding             : 3px 2px 1px 2px;
+    }
+
+/** rules for EDITABLE menulists (aka 'comboboxes'). 
+ **/
+
+/* outer frame */
+  menulist[editable="true"] 
+    {
+      padding             : 0px;
+    }
+
+/* icon display frame */
+  menulist[editable="true"] > .menu-icon 
+    {
+      list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+      background-color    : white;
+      padding             : 1px;
+      border-left         : 1px solid #9C9CFF;
+      border-top          : 1px solid #9C9CFF;
+      border-right        : none;
+      border-bottom       : 1px solid #9C9CFF;
+    }
+
+/* text display frame */    
+  menulist[editable="true"] > .menu-text 
+    {
+      border-left         : none;
+      border-top          : 1px solid #9C9CFF;
+      border-right        : 1px solid #9C9CFF;
+      border-bottom       : 1px solid #9C9CFF;
+      margin              : 0px 2px 0px 0px;
+    }
+
+/* drop marker display frame */
+  menulist[editable="true"] > .menu-dropmarker 
+    {
+      border              : 1px solid #9C9CFF;
+    }
+
+  menulist[editable="true"][open="true"] > .menu-dropmarker 
+    {
+      border              : 1px solid #FFCF00;
+    }
+

diff --git a/LCARStrek/global/skin/menulistBindings.xml b/LCARStrek/global/skin/menulistBindings.xml
index 912de3028d4ebf920f18b1e34cb6050adda9c143..52ba8465f76400e92b089c50173ae1d3a8524572 100755 (executable)
--- a/LCARStrek/global/skin/menulistBindings.xml
+++ b/LCARStrek/global/skin/menulistBindings.xml
@@ -5,11 +5,7 @@
    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 : menulist
-  XUL REPRESENTATION : <menulist>
-  -->
-  <binding id="menulist" extends="chrome://global/content/menulistBindings.xml#menulist">
+  <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">
     <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">


@@ -25,7 +21,7 @@
     </content>
   </binding>
 
     </content>
   </binding>
 

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

     <content>
       <xul:box class="menulistpopup-internal-box" orient="vertical" flex="1" style="overflow: auto">
         <children/>
     <content>
       <xul:box class="menulistpopup-internal-box" orient="vertical" flex="1" style="overflow: auto">
         <children/>

diff --git a/LCARStrek/global/skin/popup.css b/LCARStrek/global/skin/popup.css
new file mode 100644 (file)
index 0000000..d1f660f
--- /dev/null
+++ b/LCARStrek/global/skin/popup.css
@@ -0,0 +1,47 @@
+menupopup, popup
+  {
+    /* DON'T DELETE.  Removes disappearance of scrollbars
+     * in content pane when window is made smaller.
+     * Talk to evaughan@netscape.com for details.
+     */
+    min-width             : 1px;
+    background-color      : black;
+    color                 : #FF9F00;
+    border                : 1px solid #FF9F00;
+  }
+
+.popup-internal-box
+  {
+    padding               : 1px;
+  }  
+  
+/** Tooltips (tooltip <popup> element)
+ *  class="tooltip"
+ **/
+.tooltip
+  {
+    -moz-border-radius    : 3px;
+    background-color      : #9C9CFF;
+    border                : 1px solid #FFCF00;
+    color                 : #000000;
+    font                  : smaller;
+    padding               : 3px;
+  }
+
+.tooltip > .popup-internal-box
+  {
+    padding               : 0px;
+    margin                : 0px;
+  }
+
+/* rules for popups associated with menulists */
+
+  menulist > menupopup,
+  .menulist-menupopup
+    {
+      border              : 1px solid #FF9F00;
+      min-width           : 0px;
+      background-color    : black;
+    }
+
+

diff --git a/LCARStrek/global/skin/progressmeter.css b/LCARStrek/global/skin/progressmeter.css
new file mode 100644 (file)
index 0000000..c8008d6
--- /dev/null
+++ b/LCARStrek/global/skin/progressmeter.css
@@ -0,0 +1,78 @@
+/** 
+ * XUL <progressmeter> 
+ **/
+  progressmeter[mode="undetermined"] > .progressmeter-internal-box
+    {
+      background-image    : url(chrome://global/skin/progressmeter-busy.gif);
+    }
+ 
+  progressmeter[mode="undetermined"] > .progressmeter-internal-box > .progressmeter-stack > .progressmeter-progressbar 
+    {
+      visibility          : collapse;
+    }
+
+  progressmeter
+    {
+      min-width           : 100px;
+      margin              : 0px 4px 0px 4px; 
+      border              : 1px solid #FF9F00;
+      background-color    : black;
+    }
+
+  .progressmeter-statusbar 
+    {
+/*      border              : 1px solid #FF9F00; */
+      margin              : 1px 4px 1px 4px;
+      padding             : 1px;
+    }
+    
+  .progress-text 
+    {
+      visibility          : collapse;
+    }    
+
+  .progressmeter-internal-box
+    {
+/*      border              : none;
+      padding             : 1px; */
+    }
+  
+  .progressmeter-inset  
+    {
+      margin              : 1px 5px 2px 5px;
+    }
+  
+  .progressmeter-inset > .progressmeter-internal-box 
+    {
+      border              : 1px solid #9C9CFF;
+    }
+
+/* progress indicators */
+  .progress-bar 
+    {
+      background-color    : #FFCF00;
+    }
+
+/*  
+  .progress-remainder 
+    {
+      background-color    : black;
+    }
+*/
+
+  .progressmeter-progressbar[statusbar="true"] > .progress-bar
+    {
+      background-color    : #FFCF00;
+      border-right        : none;
+    }
+
+/*   
+  .progressmeter-progressbar[statusbar="true"] > .progress-remainder
+    {
+      background-color    : black;
+    }
+*/
+
+
+
+

diff --git a/LCARStrek/global/skin/scrollbox.css b/LCARStrek/global/skin/scrollbox.css
new file mode 100644 (file)
index 0000000..3ba0eac
--- /dev/null
+++ b/LCARStrek/global/skin/scrollbox.css
@@ -0,0 +1,29 @@
+/*
+ * Autorepeatbutton
+ */
+.autorepeatbutton-up {
+    list-style-image      : url("chrome://global/skin/scroll-up.gif")
+}
+
+.autorepeatbutton-down {
+    list-style-image      : url("chrome://global/skin/scroll-down.gif")
+}
+
+autorepeatbutton {
+    margin                : 1px 2px 2px 1px;
+/*    border                : 1px solid transparent; */
+    padding               : 1px;
+    height                : 1em;  
+    text-align            : center;
+    vertical-align        : middle;
+}
+
+autorepeatbutton:hover {
+    background-color      : #FFCF00;
+    color                 : black;
+    margin                : 1px;
+/*    border                : 1px inset #CCD0DD; */
+    padding               : 2px 1px 1px 2px;
+}
+
+

diff --git a/LCARStrek/global/skin/textfield.css b/LCARStrek/global/skin/textbox.css
similarity index 72%
rename from LCARStrek/global/skin/textfield.css
rename to LCARStrek/global/skin/textbox.css
index 33b017f97ce9867dc5f6345086233350b58d2ca6..b740ff4c0299c41e89230d3824ae490e53e01f2c 100755 (executable)
--- a/LCARStrek/global/skin/textfield.css
+++ b/LCARStrek/global/skin/textbox.css
@@ -36,15 +36,12 @@
     }
 
 /* internal frame */
     }
 
 /* internal frame */

-  .textbox-internal-box 
+  .textbox-internal-box, .textarea-internal-box

     {
       -moz-border-radius  : 3px;
     {
       -moz-border-radius  : 3px;

+      border              : none;

       margin              : 0px;
       padding             : 1px 2px 1px 2px;
       margin              : 0px;
       padding             : 1px 2px 1px 2px;

-      cursor              : text;
-      border              : none;
-      background-color    : inherit;
-      color               : inherit;

     }
   
   textbox[disabled="true"] > .textbox-internal-box
     }
   
   textbox[disabled="true"] > .textbox-internal-box


@@ -52,24 +49,21 @@
       border              : none;
     }
   
       border              : none;
     }
   

-  .textarea-internal-box
-    {
-      padding             : 0px 0px 0px 2px;
-    }
-  

 /* internal text widget */
   .textbox-input, .textbox-textarea
     {
 /* internal text widget */
   .textbox-input, .textbox-textarea
     {

-      color               : inherit;

       border              : none !important;
       margin              : 0px;
       border              : none !important;
       margin              : 0px;

+      padding             : 0px;

       font                : inherit;
       background-color    : inherit;
       font                : inherit;
       background-color    : inherit;

+      color               : inherit;

     }
 
   textbox[disabled="true"] 
     {
     }
 
   textbox[disabled="true"] 
     {

-      cursor              : default ! important;
+      cursor              : default !important;
+      color               : #8050B0;

     } 
     
 /** plain atomic textfields, class="plain" **/
     } 
     
 /** plain atomic textfields, class="plain" **/


@@ -82,21 +76,24 @@
       border              : none !important;
     }
 
       border              : none !important;
     }
 

-  .scrollfield
-    {
-      border              : none !important;
-      margin              : 0px;
-      margin-top          : 1px;      
-      padding             : 0px !important;
-      background          : inherit;
-    }    
-    
-  .scrollfield > .textbox-internal-box
-    {
-      border              : none !important;
-      margin              : 0px !important;
-      padding             : 0px !important;
-    }
-    
-    
-    
+/** inline edit textbox **/
+
+.textbox-inline-edit 
+  {
+    border                : 1px solid #9C9CFF !important;
+    margin                : 0px !important;
+  }
+
+.textbox-inline-edit > .textbox-internal-box > .textbox-input 
+  {
+    border                : none !important;
+    padding               : 0px !important;
+    margin                : 0px !important;
+  }
+
+.textbox-inline-edit > .textbox-internal-box 
+  {
+    border                : none !important;
+    padding               : 1px !important;
+    margin                : 0px !important;
+  }

diff --git a/LCARStrek/global/skin/titledbox.css b/LCARStrek/global/skin/titledbox.css
new file mode 100755 (executable)
index 0000000..d7c6147
--- /dev/null
+++ b/LCARStrek/global/skin/titledbox.css
@@ -0,0 +1,20 @@
+
+titledbox
+  {
+    -moz-border-radius    : 5px;
+    border                : 2px groove #9C9CFF;
+    padding               : 7px !important;
+    margin                : 5px;
+  }
+
+label
+  {
+    margin                : 0px 40px 2px 6px;
+    padding               : 0px 3px 0px 3px;
+/*    background-color      : ThreeDFace; */
+  } 
+
+.titledbox-body
+  {
+    padding               : inherit;
+  }

diff --git a/LCARStrek/global/skin/toolbar.css b/LCARStrek/global/skin/toolbar.css
index 3e110e80d5b2d51a49e1cd9dd4a19be62a0c76c2..233280c2683fccacbe2a1c98afb83c32482d05aa 100755 (executable)
--- a/LCARStrek/global/skin/toolbar.css
+++ b/LCARStrek/global/skin/toolbar.css
@@ -26,3 +26,30 @@ toolbarseparator
     width                 : 2em; 
   }
   
     width                 : 2em; 
   }
   

+menubar 
+  {
+    border-bottom         : 3px solid #000000;
+  }
+
+menubar > .toolbar-holder
+  {
+    /* max-height is only important as long as we need to workaround bug 24998... */
+    max-height            : 17px;
+    padding-right         : 18px;
+    background-color      : #6000CF;
+    background-image      : url("chrome://global/skin/menubar-endcap.gif");
+    background-repeat     : no-repeat;
+    background-position   : right;
+
+/* THE FOLLOWING LINES ARE NOT WORKING THOUGH THEY SHOULD!  BUG 24998  */
+/*    -moz-border-radius    : 0px 10px 10px 0px;
+    background-image      : url("chrome://global/skin/toolbar-bg.gif");
+    background-repeat     : repeat-y;
+    background-position   : right;
+*/
+  }
+
+menubar > toolbargrippy 
+  {
+/*    display               : none; */
+  }

diff --git a/LCARStrek/global/skin/tree.css b/LCARStrek/global/skin/tree.css
index e38bcc4c97557d2195bb9742e043c9c91feb500c..8512412ae24be57d0ad68506eaf8821e8dfe7aaf 100755 (executable)
--- a/LCARStrek/global/skin/tree.css
+++ b/LCARStrek/global/skin/tree.css
@@ -160,30 +160,3 @@ treecol[sortActive="true"]
   {
     margin-left           : 2px;
   }
   {
     margin-left           : 2px;
   }

-
-/* Inline Editable Treecells */
-.textbox-inline-edit 
-  {
-    border                : 1px solid #FFCF00 !important;
-    margin                : 0px !important;
-  }
-
-.textbox-inline-edit > .textbox-internal-box > .textbox-input 
-  {
-    border                : 0px !important;
-    padding               : 1px !important;
-    margin                : 0px !important;
-  }
-
-.textbox-inline-edit > .textbox-internal-box 
-  {
-    border                : 0px !important;
-    padding               : 0px !important;
-    margin                : 0px !important;
-  }
-
-treerow[mode="inline-edit"] 
-  {
-    background            : transparent;
-  }
-

diff --git a/LCARStrek/global/skin/wizard.css b/LCARStrek/global/skin/wizard.css
new file mode 100644 (file)
index 0000000..52e2f5c
--- /dev/null
+++ b/LCARStrek/global/skin/wizard.css
@@ -0,0 +1,40 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-header {
+  border-bottom: 2px groove 9C9CFF;
+  padding: 10px 0px 10px 0px;
+  background-color: #E7ADE7;
+  color: black;
+}
+
+.wizard-header-label {
+  margin-left: 23px;
+  font-weight: bold;
+}
+
+.wizard-header-description {
+  margin-left: 44px;
+}
+
+.wizard-page-box {
+  margin: 10px 44px;
+}
+
+.wizard-buttons-separator {
+  margin-bottom: 0px !important;
+}
+
+.wizard-buttons-box-2 {
+  margin: 10px;
+}
+
+.wizard-button[wizardbutton="finish"],
+.wizard-button[wizardbutton="next"] {
+  margin-left: -1px !important;
+}
+
+.wizard-button[wizardbutton="back"] {
+  margin-right: 0px !important;
+}
+
+

diff --git a/LCARStrek/messenger/skin/msgHdrViewOverlay.css b/LCARStrek/messenger/skin/msgHdrViewOverlay.css
index 1b61770aaba99d0767a49b129a6314ff7cf2402d..6c20552b8b2ec93bf5b4e177fd6bd341b4732c5d 100755 (executable)
--- a/LCARStrek/messenger/skin/msgHdrViewOverlay.css
+++ b/LCARStrek/messenger/skin/msgHdrViewOverlay.css
@@ -26,13 +26,15 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */
 

-#msgHeaderView
+#collapsedHeaderView,
+#expandedHeaderView

   {
   {

-  background-color: #E7ADE7;
-  background-image: none;
-  -moz-border-radius: 8px 8px 8px 8px;
-  padding-right: 12px;
-  margin-bottom: 3px;
+    min-width             : 1px;
+    background-color      : #E7ADE7;
+    color                 : black;
+    background-image      : none;
+    -moz-border-radius    : 8px;
+    margin-bottom         : 3px;

   }
 
 mail-emailaddress 
   }
 
 mail-emailaddress 


@@ -71,12 +73,22 @@ mail-emailaddress
     margin: 0px;
   }
 
     margin: 0px;
   }
 

-#attachmentButton
-  {
-    list-style-image:url("chrome://messenger/skin/attach.gif");
-    min-height: 20px;
-    margin: 0px;
-  }
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0px;
+  list-style-image: url("chrome://messenger/skin/message-mail-attach.gif");
+}
+
+#attachmentText
+{
+  font-weight: bold;
+}
+
+#attachmentTree {
+  margin: 3px;
+  height: 0px;
+  width: 20em;
+}

 
 .emailDisplayImage
   {
 
 .emailDisplayImage
   {


@@ -202,5 +214,3 @@ text.collapsedHeaderValue
   visibility: hidden;
 }
 
   visibility: hidden;
 }
 

-
-

diff --git a/LCARStrek/navigator/skin/navigator.css b/LCARStrek/navigator/skin/navigator.css
index e7c680dbf19f4dd1f3bae95b0241e042e12f2d44..ee685684a556481ece73c0db43ed78ea15d991b9 100755 (executable)
--- a/LCARStrek/navigator/skin/navigator.css
+++ b/LCARStrek/navigator/skin/navigator.css
@@ -122,54 +122,6 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
          list-style-image      : url("chrome://navigator/skin/reload-hover.gif");
   }
 
          list-style-image      : url("chrome://navigator/skin/reload-hover.gif");
   }
 

-/*all the urlbar stuff*/
-#page-proxy-button 
-  {
-         list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); 
-         cursor                : grab;
-          margin-right          : 3px;
-          margin-left           : 2px;
-  } 
-
-#ubhist-keyword-popup 
-  {
-         width                 : 10px; 
-         list-style-image      : url("chrome://global/skin/scroll-down.gif"); 
-  } 
-
-#ubhist
-  {
-    -moz-border-radius    : 0px 5px 5px 0px;
-    list-style-image      : url("chrome://global/skin/scroll-down.gif"); 
-    padding               : 0px 0px 0px 0px;
-    margin                : 0px 3px 0px 0px;
-  }
-
-#ubhist > .menubutton-icon-internal-box
-  {
-    -moz-border-radius    : 0px 5px 5px 0px;
-    border                : 1px solid #9C9CFF;
-  }  
-
-#ubhist:hover > .menubutton-icon-internal-box
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down-hover.gif"); 
-  }  
-
-#ubhist:hover:active > .menubutton-icon-internal-box,
-#ubhist[open="true"] > .menubutton-icon-internal-box
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down-hover.gif"); 
-    border                : 1px solid #FFCF00;
-  }  
-
-#action-popup 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down.gif"); 
-         margin                : 0px; 
-         -moz-border-radius    : 4px; 
-  }
-

 #content-frame 
   {
     min-width             : 0px;
 #content-frame 
   {
     min-width             : 0px;


@@ -194,8 +146,9 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 #nav-bar-inner
   {
     padding-left          : 0px;
 #nav-bar-inner
   {
     padding-left          : 0px;

-    padding-top           : 10px;
-    padding-bottom        : 10px;
+    padding-top           : 11px;
+    padding-bottom        : 11px;
+    vertical-align        : middle;

   }
 
 #search-button
   }
 
 #search-button


@@ -245,4 +198,42 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
     padding               : 0px;
   }
 
     padding               : 0px;
   }
 

+/* all the urlbar stuff */
+
+#page-proxy-button 
+  {
+         list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); 
+         cursor                : grab;
+          margin-right          : 3px;
+          margin-left           : 2px;
+  } 
+
+#action-popup 
+  {
+    list-style-image      : url("chrome://global/skin/scroll-down.gif"); 
+         margin                : 0px; 
+         -moz-border-radius    : 5px; 
+  }
+
+/*
+.autocomplete-textbox-container
+  {
+  }
+*/
+
+#urlbar-container
+  {
+    -moz-border-radius    : 5px;
+    border                : 1px solid #9C9CFF;
+    background-color      : #000000;
+    padding               : 0px;
+  }
+
+#urlbar-group
+  {
+    margin-left           : 3px;
+    margin-right          : 5px;
+  }
+
+