From 58ed03ff93a16dba8b5ae37ad9ca6d8f9ba225b2 Mon Sep 17 00:00:00 2001 From: soup-bowl Date: Mon, 27 May 2024 20:33:30 +0000 Subject: [PATCH 1/3] Changes recommended by soulhotel for menu positioning. Ref #29 --- IE6/chrome/tabs.css | 5 +++++ IE6/chrome/toolbars.css | 2 +- IE6/chrome/urlbar.css | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/IE6/chrome/tabs.css b/IE6/chrome/tabs.css index 5b24671..4782979 100644 --- 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 index e3c221e..521d3c0 100644 --- 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 index 4258379..24d7455 100644 --- 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 */ From fff38dc86f7c1332c9a62ce5bbd1c862e626f49d Mon Sep 17 00:00:00 2001 From: soup-bowl Date: Mon, 27 May 2024 20:39:00 +0000 Subject: [PATCH 2/3] Replaced all instances of :-moz-lwtheme with [lw-theme] --- IE6/chrome/icons.css | 36 +++++++++++++++---------------- IE6/chrome/identitybox_colors.css | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/IE6/chrome/icons.css b/IE6/chrome/icons.css index de1d436..d958a0e 100644 --- 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 index ba509a1..da8e74f 100644 --- 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; } From ad433861f0502e9c41a39263cdac9c0b765f9b8f Mon Sep 17 00:00:00 2001 From: soup-bowl Date: Mon, 27 May 2024 20:51:48 +0000 Subject: [PATCH 3/3] Warning removed. --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 0196be1..d9aa6e8 100644 --- 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.