Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FireFox 117 - Fix unified popup #12

Merged
merged 18 commits into from
Aug 29, 2023
Merged

FireFox 117 - Fix unified popup #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d23e2a9
FireFox - additions
Nomes77 Aug 29, 2023
4c85f27
FireFox - autohide
Nomes77 Aug 29, 2023
7535292
FireFox - bookmarkbar
Nomes77 Aug 29, 2023
789b88f
FireFox - compatability
Nomes77 Aug 29, 2023
8c4ce0f
FireFox - contents
Nomes77 Aug 29, 2023
a0a8e51
FireFox - decorations
Nomes77 Aug 29, 2023
97866df
FireFox - icons
Nomes77 Aug 29, 2023
b6848a5
FireFox - library
Nomes77 Aug 29, 2023
3ca1065
FireFox - padding
Nomes77 Aug 29, 2023
dfca91d
FireFox - rounding
Nomes77 Aug 29, 2023
94d319d
FireFox - tabbar
Nomes77 Aug 29, 2023
a281305
Delete FireFox/theme/built_in_color.css
Nomes77 Aug 29, 2023
3a97ba1
FireFox - theme
Nomes77 Aug 29, 2023
93b8529
FireFox - urlview
Nomes77 Aug 29, 2023
1de1ac2
FireFox - userChrome & userContent
Nomes77 Aug 29, 2023
2439b2b
FireFox - `user.js`
Nomes77 Aug 29, 2023
9a7fb73
FireFox - content/context_menu.css
Nomes77 Aug 29, 2023
4f7c246
FireFox - extension_popup.css
Nomes77 Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions FireFox/additions/extension_popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,27 @@ panelmultiview[mainViewId="unified-extensions-view"] .unified-extensions-item .u
panelmultiview[mainViewId="unified-extensions-view"] {
--uei-icon-size: 16px !important
}
panelmultiview[mainViewId="unified-extensions-view"] toolbarbutton.unified-extensions-item-action-button {
panelmultiview[mainViewId="unified-extensions-view"] toolbarbutton.unified-extensions-item-action-button,
panelmultiview[mainViewId="unified-extensions-view"] toolbarbutton.unified-extensions-item-menu-button {
min-height: var(--uei-icon-size) !important;
}
panelmultiview[mainViewId="unified-extensions-view"] toolbarbutton:not(:last-child) {
margin-top: -2px !important;
margin-bottom: -2px !important;
panelmultiview[mainViewId="unified-extensions-view"] panelview toolbaritem {
margin-block: -2px !important;
}
panelmultiview[mainViewId="unified-extensions-view"] panelview .unified-extensions-item:last-child {
margin-top: -2px !important;
margin-bottom: var(--arrowpanel-menuitem-margin-inline) !important;
}
panelmultiview[mainViewId="unified-extensions-view"] panelview .unified-extensions-item-name {
padding-inline-start: 0.125em !important;
}
panelmultiview[mainViewId="unified-extensions-view"] panelview .unified-extensions-item > .subviewbutton {
border-radius: var(--arrowpanel-menuitem-border-radius) !important;
margin-top: 5px !important;
margin-bottom 5px !important;
}
panelmultiview[mainViewId="unified-extensions-view"] toolbarbutton.unified-extensions-item-menu-button {
padding: 0px !important;
}
panelmultiview[mainViewId="unified-extensions-view"] .unified-extensions-item .webextension-browser-action.subviewbutton > .toolbarbutton-badge-stack {
margin-inline-end: 2px !important;
}
Expand Down
18 changes: 7 additions & 11 deletions FireFox/autohide/menubar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
display: none;
}
@supports -moz-bool-pref("userChrome+Content.padding.drag_space") {
@media (-moz-platform: windows-win10), (-moz-gtk-csd-available) {
@media (-moz-platform: windows), (-moz-gtk-csd-available) {
:root[tabsintitlebar="true"][sizemode="normal"]:not([chromehidden~="menubar"], [inFullscreen])
#titlebar:has(#toolbar-menubar[autohide="true"]) {
height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)) !important;
Expand All @@ -30,16 +30,12 @@
background-color: var(--lwt-accent-color);
}
@media (-moz-windows-compositor) {
@media not (-moz-platform: windows-win7) {
@media not (-moz-platform: windows-win8) {
@media (-moz-windows-default-theme) {
#toolbar-menubar[brighttext] > #menubar-items > #main-menubar > menu[_moz-menuactive="true"] {
background-color: color-mix(in srgb, transparent, black 16%) !important;
}
#main-menubar > menu[_moz-menuactive="true"] {
background-color: color-mix(in srgb, transparent, white 16%) !important;
}
}
@media (-moz-windows-default-theme) {
#toolbar-menubar[brighttext] > #menubar-items > #main-menubar > menu[_moz-menuactive="true"] {
background-color: color-mix(in srgb, transparent, black 16%) !important;
}
#main-menubar > menu[_moz-menuactive="true"] {
background-color: color-mix(in srgb, transparent, white 16%) !important;
}
}
}
Expand Down
78 changes: 18 additions & 60 deletions FireFox/compatibility/os.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,5 @@
/*= OS - Compatibility ==============================================================*/
/*= Windows - Native Menu ==============================================*/
@media not (-moz-windows-non-native-menus) {
@media (-moz-platform: windows-win7), (-moz-platform: windows-win8), (-moz-platform: windows-win10) {
.customization-uidensity-menuitem > .menu-iconic-left {
width: unset !important;
}
menulist > menupopup > menuitem[_moz-menuactive="true"],
menulist > menupopup > menu[_moz-menuactive="true"] {
background-color: highlight !important;
color: highlighttext !important;
}
#PlacesToolbar menu,
#PlacesToolbar menuitem,
#BMB_bookmarksPopup menu,
#BMB_bookmarksPopup menuitem {
border: none !important; /* Remove border */
}
#PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"],
#PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"],
#BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"],
#BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] {
background-color: var(--button-hover-bgcolor) !important;
}
}
@media (-moz-platform: windows-win10) {
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"],
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"],
menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"],
menupopup:not([placespopup="true"]) menuitem[_moz-menuactive="true"] {
background-color: #91c9f7 !important;
border-color: transparent !important;
}
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"][disabled="true"],
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"][disabled="true"],
menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"][disabled="true"],
menupopup:not([placespopup="true"]) menuitem[_moz-menuactive="true"][disabled="true"] {
background-color: color-mix(in srgb, currentColor 9%, transparent) !important;
border-color: transparent !important;
}
}
}
@media (-moz-gtk-csd-available) {
/*= Linux - Global Menubar Active Color ================================*/
#main-menubar > menu[open="true"],
Expand All @@ -66,26 +26,24 @@
}
}
/*= Linux - Light System Default Theme's Selected Tab ====================*/
@media (-moz-gtk-csd-available) {
@media (prefers-color-scheme: light) {
/* Because of
#TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected=true], [multiselected]) > .tab-stack > .tab-background {
border: 1px solid var(--tab-line-color, rgba(128,128,142,0.9));
box-shadow: 0 0 4px rgba(128,128,142,0.5);
}
*/
@media (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
/* Because of
#TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected=true], [multiselected]) > .tab-stack > .tab-background {
border: 1px solid var(--tab-line-color, rgba(128,128,142,0.9));
box-shadow: 0 0 4px rgba(128,128,142,0.5);
}
*/
#tabbrowser-tabs:not([noshadowfortests])
.tabbrowser-tab:is([visuallyselected="true"], [multiselected])
> .tab-stack
> .tab-background:not(:-moz-lwtheme) {
box-shadow: 0 0 4px rgba(128, 128, 142, 0.5) !important;
}
#TabsToolbar:not([brighttext])
#tabbrowser-tabs:not([noshadowfortests])
.tabbrowser-tab:is([visuallyselected="true"], [multiselected])
> .tab-stack
> .tab-background:not(:-moz-lwtheme) {
box-shadow: 0 0 4px rgba(128, 128, 142, 0.5) !important;
}
#TabsToolbar:not([brighttext])
#tabbrowser-tabs:not([noshadowfortests])
.tabbrowser-tab:is([visuallyselected="true"], [multiselected])
> .tab-stack
> .tab-background:not(:-moz-lwtheme) {
box-shadow: 0 0 1px var(--tab-line-color, rgba(128, 128, 142, 0.9)), 0 0 4px rgba(128, 128, 142, 0.5) !important;
}
.tabbrowser-tab:is([visuallyselected="true"], [multiselected])
> .tab-stack
> .tab-background:not(:-moz-lwtheme) {
box-shadow: 0 0 1px var(--tab-line-color, rgba(128, 128, 142, 0.9)), 0 0 4px rgba(128, 128, 142, 0.5) !important;
}
}
162 changes: 27 additions & 135 deletions FireFox/contents/context_menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,16 @@
:not(#ContentSelectDropdown) menupopup:not(.in-menulist) > menuitem,
:not(#ContentSelectDropdown) menupopup > menu,
#context-navigation > menuitem[_moz-menuactive] .menu-iconic-icon {
border-radius: var(--arrowpanel-menuitem-border-radius, var(--panel-border-radius)) !important;
}
/* Width */
:not(#ContentSelectDropdown) menupopup:not(.in-menulist) > menuitem,
:not(#ContentSelectDropdown) menupopup > menu {
max-width: 25em !important;
border-radius: var(--arrowpanel-menuitem-border-radius, var(--panel-border-radius)) !important; /* 4px */
}
/* Icon */
:not(menu, #ContentSelectDropdown)
> menupopup:not(.in-menulist)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
:not(menu, #ContentSelectDropdown) > menupopup:not(.in-menulist)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#clearDownloadsButton /* Library */ {
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
/* Color */
-moz-context-properties: fill, fill-opacity, stroke !important;
fill: currentColor !important;
Expand All @@ -60,137 +45,45 @@
/* Padding as Arrow Panel */
:root {
--uc-menu-background-position: left;
--context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline);
--context-menu-background-padding: 3px /* var(--arrowpanel-menuitem-padding-inline); */
}
:root:-moz-locale-dir(rtl) {
--uc-menu-background-position: right;
}
:not(menu, #ContentSelectDropdown, #context-navigation, #permission-popup-menulist)
> menupopup:not(.in-menulist)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
:not(menu, #ContentSelectDropdown, #context-navigation, #permission-popup-menulist)
> menupopup:not(.in-menulist)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem,
menupopup[needsgutter] menu:not([icon], .menu-iconic),
menupopup[needsgutter] menuitem:not([checked="true"], [icon], .menuitem-iconic),
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#clearDownloadsButton /* Library */ {
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
padding-inline-start: var(--context-menu-background-padding) !important;
margin: 0 5px; /* var(--arrowpanel-menuitem-margin); */
}
/* Padding - Non Native */
@media (-moz-gtk-csd-available), (-moz-platform: windows-win7), (-moz-platform: windows-win8), (-moz-platform: windows-win10) {
@media (-moz-windows-non-native-menus) {
:root {
--context-menu-text-padding: calc(var(--arrowpanel-menuicon-width) + var(--arrowpanel-menutext-padding)); /* 16px + 8px */
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
padding-inline-start: var(--menu-background-padding-default) !important;
/* margin-left: 0 !important; */
}
@media (-moz-platform: windows), (-moz-gtk-csd-available) {
:root {
--context-menu-text-padding: 24px; /* calc(var(--arrowpanel-menuicon-width) + var(--arrowpanel-menutext-padding)) */
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
}
@supports -moz-bool-pref("userChrome.theme.non_native_menu") {
@media (-moz-gtk-csd-available) {
:root {
--context-menu-text-padding: calc(var(--arrowpanel-menuicon-width) + var(--arrowpanel-menutext-padding)); /* 16px + 8px */
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
padding-inline-start: var(--menu-background-padding-default) !important;
/* margin-left: 0 !important; */
}
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menu:not(.menu-iconic, .in-menulist, [checked="true"]),
menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
padding-inline-start: var(--menu-background-padding-default) !important;
}
}
/* Padding - Windows */
@media (-moz-platform: windows-win7), (-moz-platform: windows-win8), (-moz-platform: windows-win10) {
@media not (-moz-windows-non-native-menus) {
@media (-moz-platform: windows), (-moz-gtk-csd-available) {
@supports -moz-bool-pref("userChrome.theme.non_native_menu") {
:root {
--context-menu-text-padding: calc(var(--arrowpanel-menuicon-width) + var(--arrowpanel-menutext-padding) + 1.4px);
--menu-background-padding-default: 0px;
}
@media (-moz-platform: windows-win10) {
@supports -moz-bool-pref("userChrome+Content.compatibility.os.win11") {
:root {
--context-menu-background-padding: 5px;
}
#main-menubar {
--context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
}
menuitem:is([type="checkbox"], [type="radio"]) {
--menu-padding: 0px;
}
menuitem[checked="true"] {
--context-menu-background-padding: 0px;
}
menuitem[checked="true"] > .menu-iconic-left {
transform: translateX(2px);
}
}
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
appearance: none !important;
padding-block: 0 !important;
padding-inline-start: 0px;
margin-inline-end: 6px !important; /* var(--arrowpanel-menutext-padding) */
}
@supports -moz-bool-pref("userChrome+Content.compatibility.os.win11") {
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
box-sizing: content-box;
}
}
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
menupopup:not([placespopup="true"]) .menu-accel,
menupopup:not([placespopup="true"]) .menu-iconic-accel {
box-sizing: content-box;
min-height: 16px;
}
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text,
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text,
menupopup:not([placespopup="true"]) .menu-accel,
menupopup:not([placespopup="true"]) .menu-iconic-accel,
menupopup:not([placespopup="true"]) .menu-text,
menupopup:not([placespopup="true"]) .menu-iconic-text {
padding-block: 0 !important;
}
--context-menu-text-padding: 24px; /* calc(var(--arrowpanel-menuicon-width) + var(--arrowpanel-menutext-padding)) */
--menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
}
}
}
@media (-moz-platform: windows-win7), (-moz-platform: windows-win8), (-moz-platform: windows-win10) {
@media not (-moz-windows-non-native-menus) {
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
Expand All @@ -199,8 +92,7 @@
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
> menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
background-position: left var(--context-menu-background-padding) center !important;
padding-inline-start: 0 !important;
padding-inline-start: var(--menu-background-padding-default) !important;
}
}
}
Expand Down
Loading