Merge pull request #31 from soup-bowl/29-address-bar-popup-alignment-…

…issues-on-nightly Fix menu alignment issues & lw-theme refactor
soup-bowl · May 27, 2024 · a57a060 · a57a060
2 parents fa5607f + ad43386
commit a57a060
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/IE6/chrome/icons.css b/IE6/chrome/icons.css
@@ -25,24 +25,24 @@
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text,
 #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar toolbarbutton[type="menu-button"] .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-text,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
-#main-window:not([style*='--lwt-header-image']):-moz-lwtheme:-moz-lwtheme-brighttext #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon ,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext]:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext]:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext]:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-badge-stack,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar toolbarbutton[type="menu-button"] .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-text,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
+#main-window:not([style*='--lwt-header-image'])[lwtheme="true"][lwtheme-brighttext] #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon ,
 #main-window:not([customizing]) #toolbar-menubar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active),
 #toolbar-menubar toolbarbutton[type="menu-button"],
 #toolbar-menubar .toolbarbutton-1 > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,

diff --git a/IE6/chrome/identitybox_colors.css b/IE6/chrome/identitybox_colors.css
@@ -10,8 +10,8 @@ display: none !important;
 	opacity: 1.0 !important;
 }
 
-#main-window:-moz-lwtheme-brighttext *:not(.chromeUI) > #identity-icon,
-#main-window:-moz-lwtheme-brighttext *:not(.chromeUI):not(.verifiedDomain):not(.verifiedIdentity) > #page-proxy-favicon {
+#main-window[lwtheme-brighttext] *:not(.chromeUI) > #identity-icon,
+#main-window[lwtheme-brighttext] *:not(.chromeUI):not(.verifiedDomain):not(.verifiedIdentity) > #page-proxy-favicon {
 	box-shadow: inset 0 0 0 8px rgba(255,255,255,1.0) !important;
 	border-radius: 1000px !important;
 }

diff --git a/IE6/chrome/tabs.css b/IE6/chrome/tabs.css
@@ -102,3 +102,8 @@ spacer[part=overflow-end-indicator] {
 .tab-icon-sound {
 	margin-right: 2px !important;
 }
+
+/* https://github.com/soup-bowl/Modoki-Firefox/issues/29#issuecomment-2133967288 */
+#TabsToolbar-customization-target {
+	height: 27.4px !important;
+}
diff --git a/IE6/chrome/toolbars.css b/IE6/chrome/toolbars.css
@@ -90,7 +90,7 @@ toolbar:not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar) {
 	max-height: 27px !important;
 }
 
-:root:not([lwtheme-image]) .browserContainer>findbar:-moz-lwtheme {
+:root:not([lwtheme-image]) .browserContainer>findbar[lwtheme="true"] {
 	background-color: rgba(221, 227, 235, 1) !important;
 	background-image: none !important;
 }

diff --git a/IE6/chrome/urlbar.css b/IE6/chrome/urlbar.css
@@ -61,8 +61,8 @@
 	padding-left: 3px !important; }
 
 #urlbar[breakout-extend] {
-	top:calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important;
-	left:calc((var(--urlbar-toolbar-width) - var(--urlbar-width)) / 2) !important;
+	top:calc((var(--urlbar-container-height) - var(--urlbar-height)) - 2px / 2) !important;
+	left:calc((var(--urlbar-container-height) - var(--urlbar-width)) / 2) !important;
 	width:100% !important }
 
 #urlbar[breakout-extend] #urlbar-input-container {
@@ -84,7 +84,6 @@
 	width:100%!important;
 	background-color: #ffffff !important;
 	border: 1px solid #000 !important;
-	border-top: none !important;
 }
 
 /* identity box */

diff --git a/README.md b/README.md
@@ -15,9 +15,6 @@
 
 This project aims to bring the Modern Modoki (or close in appearance) theme back to Firefox using the amazing Redmond Firefox theme base, via Firefox's remaining UserChrome interface.
 
-> [!WARNING]  
-> **Firefox 126** introduces a breaking change to the menu. I haven't located it yet, so **this theme will be functionally broken**. I recommend disabling it until it is located an fixed. The issue is tracked in [#29](https://github.com/soup-bowl/Modoki-Firefox/issues/29).
-
 If you're using Pale Moon browser, Use **[Modoki Moon][mmm]** instead of this - a full fork of the original.
 
 This theme pairs beautifully with the **[Chicago95 theme for XFCE][c95]**.
@@ -28,7 +25,6 @@ This theme pairs beautifully with the **[Chicago95 theme for XFCE][c95]**.
 
 ## 🐞 Bugs & Limitations
 
-* **Firefox 126^ - The URL bar menu will appear over the search bar, causing significant usibility issues** - tracked in [#29](https://github.com/soup-bowl/Modoki-Firefox/issues/29).
 * MacOS is **not supported**. **Linux** and **Windows** is supported.
   * This theme is primarily tested on **XFCE**. Other setups may encounter bugs.
 * This theme is **not compatible** with Firefox skins/themes, or a combined title bar.