some actual work on getting Firefox theming nearer to right

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f3b3c58d29c40f4e348bf15cde5debfc114b7ffa..c8e72fa9ecd329df44755a3ade7472a9c9dabd94 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -133,6 +133,12 @@ menubar {
   color: #FFCF00;
 }
 
+#appmenu-button:hover:not(:active):not([open]) {
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
+}
+
 #appmenu-button:hover,
 #appmenu-button:hover:active,
 #appmenu-button[open] {
@@ -394,8 +400,6 @@ menuitem.bookmark-item {
 
 /* ::::: primary toolbar buttons ::::: */
 
-/* ::::: large toolbar buttons ::::: */
-
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 36px;
@@ -516,13 +520,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
 
 #navigator-toolbox[iconsize=small] > #nav-bar {
-  padding-top: 1px;
-  padding-bottom: 1px;
 }
 
 #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
-  padding-left: 2px;
-  padding-right: 2px;
 }
 
 
@@ -539,19 +539,32 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-start: 0;
 }
 
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+  -moz-image-region: rect(18px, 20px, 38px, 0);
+}
+
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl),
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
   -moz-transform: scaleX(-1);
 }
 
-#back-button:-moz-locale-dir(ltr) {
+#nav-bar #back-button {
+  -moz-margin-end: 0 !important;
+}
+
+#nav-bar #forward-button {
+  border-left-style: none;
+  -moz-margin-start: 0 !important;
+}
+
+#nav-bar #back-button:-moz-locale-dir(ltr) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
-#back-button:-moz-locale-dir(rtl),
-#forward-button {
+#nav-bar #back-button:-moz-locale-dir(rtl),
+#nav-bar #forward-button {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -755,18 +768,25 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 #zoom-in-button {
   -moz-image-region: rect(0, 306px, 18px, 288px);
+}
+
+#nav-bar #zoom-out-button {
+  -moz-margin-end: 0;
+}
+
+#nav-bar #zoom-in-button {
   -moz-border-start: none;
   -moz-margin-start: 0;
 }
 
-#zoom-out-button:-moz-locale-dir(ltr),
-#zoom-in-button:-moz-locale-dir(rtl) {
+#nav-bar #zoom-out-button:-moz-locale-dir(ltr),
+#nav-bar #zoom-in-button:-moz-locale-dir(rtl) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
-#zoom-out-button:-moz-locale-dir(rtl),
-#zoom-in-button:-moz-locale-dir(ltr) {
+#nav-bar #zoom-out-button:-moz-locale-dir(rtl),
+#nav-bar #zoom-in-button:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -998,19 +1018,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 /* autocomplete */
 
-#PopupAutoComplete,
-#PopupAutoCompleteRichResult {
-  direction: ltr !important;
-}
-
-#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
-  direction: rtl;
-}
-
-#PopupAutoComplete .autocomplete-treebody {
-  direction: ltr;
-}
-
 #treecolAutoCompleteImage {
   max-width: 36px;
 }
@@ -1232,11 +1239,18 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 /* Tabstrip */
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
+}
+
+#TabsToolbar .toolbar-holder {
+  background-color: #000000; /* correct effect of being an actal toolbar */
 }
 
+#main-window[disablechrome] #TabsToolbar,
 #TabsToolbar[tabsontop="false"] {
   border-bottom: 1px solid #FF9F00;
 }
@@ -1473,6 +1487,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
+.tabs-closebutton > .toolbarbutton-icon {
+}
+
 .tabs-closebutton:hover,
 .tabs-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1883,12 +1900,34 @@ panel[dimmed="true"] {
   opacity: 0.5;
 }
 
-/* Vertically-center the statusbar compatibility shim, because
-   toolbars, even in small-icon mode, are a bit taller than
-   statusbars. Also turn off the statusbar border. On Windows
-   we have to disable borders on statusbar *and* child statusbar
-   elements. */
+/* Add-on bar */
+
+#addon-bar {
+  min-height: 20px;
+  border-top: 3px solid #000000;
+}
+
+#addon-bar:not(:-moz-lwtheme) {
+  -moz-appearance: statusbar;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-startcap,
+#addon-bar .toolbar-endcap{
+  background-color: #6000CF;
+}
+
 #status-bar {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
   margin-top: .3em;
   border-width: 0;
 }
@@ -1899,7 +1938,6 @@ panel[dimmed="true"] {
   border-width: 0;
 } */
 
-/* Add-on bar close button */
 #addonbar-closebutton {
   border: none;
   padding: 3px 5px;

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index f5eda35282852686239d1cba52f43593c315a4c2..41ad8dd8c473494925a284ab7d6a3f7eafd935e6 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -78,9 +78,8 @@ menubar {
 }
 
 toolbaritem > menubar {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
-
 /*
 progressmeter[mode="undetermined"] {
   -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");