keeping up with classic development

diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index ecc25b2820ef315c6d74c6b397b5a6906cd9eaa0..a85f431420335aff8dbcd2e365b62673f2a253d8 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -50,7 +50,7 @@
    ========================================================================== */
 
 .toolbar-primary {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-primary");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-primary");
 }
 
 #offline-status[offline="true"] {

diff --git a/LCARStrek/communicator/toolbar.css b/LCARStrek/communicator/toolbar.css
index ddbfb781b395b6f28c9ba0bc366fc9f48c1fd644..b442d8484c3586b34f72ec204e8c07a5355856eb 100644 (file)
--- a/LCARStrek/communicator/toolbar.css
+++ b/LCARStrek/communicator/toolbar.css
@@ -51,10 +51,7 @@
   background-color: #9C9CFF;
 }
 
-.toolbar-primary > toolbargrippy {
+.toolbar-primary > .toolbar-begcap {
   background-color: #9C9CFF; 
 }
 
-.toolbar-primary > toolbargrippy:hover {
-  background-color: #FFCF00; 
-}

diff --git a/LCARStrek/editor/EdImageMap.css b/LCARStrek/editor/EdImageMap.css
index b9ed70c945685de2bafe4986a2e2d9aff411a8e9..cebd6e9b3cb95251710e1d36effbf360d6d390ac 100644 (file)
--- a/LCARStrek/editor/EdImageMap.css
+++ b/LCARStrek/editor/EdImageMap.css
@@ -61,10 +61,6 @@ toolbar#toolbox button.tool {
        color: inherit;
 }
 
-toolbar.toolbox > toolbargrippy {
-       visibility: collapse;
-}
-
 #pointerButton {
        list-style-image:url("chrome://editor/skin/icons/Map_pointerTool.gif");
 }

diff --git a/LCARStrek/editor/editor.css b/LCARStrek/editor/editor.css
index 3d86836981498180e0f2ca802ca6adf12bd677b1..efab7d33c48abcc921d7986d0f18ee3f9dcb59ba 100644 (file)
--- a/LCARStrek/editor/editor.css
+++ b/LCARStrek/editor/editor.css
@@ -67,3 +67,28 @@
  
 #ContentWindowDeck {
 }
+
+/* ::::: struct toolbar ::::: */
+
+#structToolbar {
+  min-width: 1px;
+  overflow: hidden;
+}
+
+#structSpacer {
+  margin: 2px 0px;
+}
+
+.struct-button {
+  padding: 2px;
+}
+
+.struct-button[checked="true"] {
+  font-weight: bold;
+}
+
+.struct-textbox {
+  padding: 0px !important;
+  margin: 0px !important;
+  border: none !important;
+}
\ No newline at end of file

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index fcc647582501c9193fc2d93b29aa1259461df177..4ad4a8d6d188ffd8655d7dbad7e116c837453bc3 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -32,9 +32,18 @@
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
-      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy"
-                         class="toolbar-grippy"/>
+      <xul:hbox class="toolbar-begcap"/>
+      <xul:hbox flex="1" class="toolbar-holder" align="center"
+               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+        <children/>
+      </xul:hbox>
+      <xul:hbox class="toolbar-endcap"/>
+    </content>
+  </binding>
+
+  <binding id="toolbar-primary" extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
+    <content>
+      <xul:hbox class="toolbar-begcap"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
@@ -49,8 +58,7 @@
     </resources>
 
     <content>
-      <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
+      <xul:hbox class="menubar-begcap"/>
       <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
         <children/>
       </xul:hbox>

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index 007a1ea7f065fc020f3c7e32222b833367b20235..e373239f6c7a6e3da5865e61158b1c48e41861c4 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -66,21 +66,24 @@ menubar > .toolbar-holder {
   background-color: #6000CF;
 }
 
-/* ::::: toolbargrippy ::::: */
+/* ::::: begcap (LCARStrek specific) ::::: */
 
-toolbargrippy {
-  -moz-box-orient: vertical;
+toolbar > .toolbar-begcap {
   -moz-border-radius: 8px 0px 0px 8px;
-  -moz-box-align: center;
+  background-color: #FF9F00;
   border: none;
   border-right: 3px solid black;
-  background-color: #FF9F00;
   width: 15px;
   min-height: 16px;
 }
 
-toolbargrippy:hover {
-  background-color: #FFCF00;
+menubar > .menubar-begcap {
+  -moz-border-radius: 8px 0px 0px 8px;
+  background-color: #FF9F00;
+  border: none;
+  border-right: 3px solid black;
+  width: 15px;
+  min-height: 16px;
 }
 
 /* ::::: endcap (LCARStrek specific) ::::: */
@@ -103,20 +106,6 @@ menubar > .menubar-endcap {
   min-height: 16px;
 }
 
-/* ::::: collapsed tray and grippies ::::: */
-
-toolbargrippy[tbgrippy-collapsed="true"] {
-  -moz-box-orient: horizontal;
-  -moz-border-radius: 5px 0px 0px 5px;
-  margin-bottom: 3px;
-  width: 30px;
-  height: 10px;
-}
-
-.collapsed-tray-spacer {
-  border-bottom: none;
-}  
-
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {