Skip to content

Commit

Permalink
4.6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aris-t2
Aris-t2 committed Dec 1, 2024
1 parent a2a8f68 commit cbf2735
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 130 deletions.
43 changes: 22 additions & 21 deletions current/css/appbutton/appbutton_in_titlebar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,43 @@
/* cheat main menu button into title bar ********/
/************************************************/

:root {
--appbutton_in_titlebar: 95px !important;
}

/* menubar adjustments */
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
padding-inline-start: 95px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
padding-inline-start: 94px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
padding-inline-start: 93px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
padding-inline-start: 92px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

/* tabs toolbar adjustments */
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: 95px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: 94px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: 93px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: 92px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #TabsToolbar {
padding-inline-start: 95px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar,
Expand All @@ -65,17 +66,16 @@
top: 0px !important;
}


/* code for macOS/Linux */

@media not (-moz-platform: windows) {
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #PanelUI-button {
top: 0px !important;
top: 0 !important;
}
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #PanelUI-button {
top: 0px !important;
top: 0 !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
Expand All @@ -94,11 +94,10 @@
}

/* code for macOS/Linux */

@media not (-moz-platform: windows) {
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
max-width: 90px !important;
}
max-width: var(--appbutton_in_titlebar) !important;
}
}

/* hide button in fullscreen mode, if toolbars get automatically hidden */
Expand Down Expand Up @@ -158,11 +157,12 @@
/* adjust button badge stack */
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked],[open],:active) > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true],[checked],[open],:active):hover > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack{
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
background: unset !important;
border-color: unset !important;
border: 0 !important;
box-shadow: unset !important;
outline: unset !important;
}

/* adjust button badge */
Expand Down Expand Up @@ -240,6 +240,7 @@
padding: 6px !important;
width: 9px !important;
height: 7px !important;
outline: unset !important;
}

/* fix for toolbar + text mode */
Expand Down Expand Up @@ -269,7 +270,7 @@

/* support for tab title in Firefox titlebar option*/
#main-window:is([tabsintitlebar],[customtitlebar])::after {
margin-inline-start: 95px !important;
margin-inline-start: var(--appbutton_in_titlebar) !important;
}

/* remove this nonsense button, a menuitem is inside menu button anyways */
Expand Down Expand Up @@ -331,7 +332,7 @@ panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
}

#main-window:is([tabsintitlebar],[customtitlebar]) #TabsToolbar {
padding-inline-end: 100px !important;
padding-inline-end: calc(var(--appbutton_in_titlebar) + 5px) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]) .titlebar-buttonbox-container {
Expand Down
96 changes: 52 additions & 44 deletions current/css/appbutton/appbutton_in_titlebar_icon_only.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,56 @@
/* cheat main menu button into title bar ********/
/************************************************/

/* tabs toolbar adjustments */
:root {
--appbutton_in_titlebar: 45px !important;
}

/* menubar adjustments */
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
padding-inline-start: 43px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
padding-inline-start: 41px !important;
padding-inline-start:var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
padding-inline-start: 40px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
padding-inline-start: 39px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
padding-inline-start: 48px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar {
padding-inline-start: 47px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

/* tabs toolbar adjustments */
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 43px !important;
#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 41px !important;
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 40px !important;
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 39px !important;
#main-window[uidensity=compact]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 48px !important;
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
padding-inline-start: 47px !important;
#main-window[uidensity=touch]:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar {
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #TabsToolbar {
padding-inline-start: 43px !important;
padding-inline-start: var(--appbutton_in_titlebar) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="true"]:not([inactive="true"]) ~ #TabsToolbar,
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] ~ #TabsToolbar{
#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] ~ #TabsToolbar {
margin-top: 4px !important;
}

Expand All @@ -75,12 +79,12 @@

@media not (-moz-platform: windows) {
#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #PanelUI-button {
top: 0px !important;
top: 0 !important;
}
}

#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #PanelUI-button {
top: 0px !important;
top: 0 !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
Expand All @@ -101,7 +105,7 @@
/* code for macOS/Linux */
@media not (-moz-platform: windows) {
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button {
max-width: 40px !important;
max-width: var(--appbutton_in_titlebar) !important;
}
}

Expand All @@ -122,9 +126,9 @@
}

/* adjust button badge stack */
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack{
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([checked],[open],:active) > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true],[checked],[open],:active):hover > .toolbarbutton-badge-stack,
#main-window:is([tabsintitlebar],[customtitlebar]) :is(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
background: unset !important;
border-color: unset !important;
border: 0 !important;
Expand All @@ -150,10 +154,10 @@
border-bottom-color: hsla(214,89%,21%,.5) !important;
box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
0 0 2px 1px hsla(0,0%,100%,.25) inset,
0 1px 0 0px rgba(255,255,255,.5),
0 -1px 0 0px rgba(255,255,255,.5),
1px 0 0 0px rgba(255,255,255,.5),
-1px 0 0 0px rgba(255,255,255,.5) !important;
0 1px 0 0px rgba(255,255,255,.6),
0 -1px 0 0px rgba(255,255,255,.6),
1px 0 0 0px rgba(255,255,255,.6),
-1px 0 0 0px rgba(255,255,255,.6) !important;
}
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%),
Expand All @@ -163,31 +167,31 @@
box-shadow: 0 1px 0 hsla(0,0%,100%,.15) inset,
0 0 2px 1px hsla(0,0%,100%,.5) inset,
0 -1px 0 hsla(0,0%,100%,.2),
0 1px 0 0px rgba(255,255,255,.5),
0 -1px 0 0px rgba(255,255,255,.5),
1px 0 0 0px rgba(255,255,255,.5),
-1px 0 0 0px rgba(255,255,255,.5) !important;
0 1px 0 0px rgba(255,255,255,.6),
0 -1px 0 0px rgba(255,255,255,.6),
1px 0 0 0px rgba(255,255,255,.6),
-1px 0 0 0px rgba(255,255,255,.6) !important;
}
#main-window:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]){
background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important;
box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
0 1px 1px rgba(0,0,0,.2) inset,
0 1px 0 0px rgba(255,255,255,.5),
0 -1px 0 0px rgba(255,255,255,.5),
1px 0 0 0px rgba(255,255,255,.5),
-1px 0 0 0px rgba(255,255,255,.5) !important;
0 1px 0 0px rgba(255,255,255,.6),
0 -1px 0 0px rgba(255,255,255,.6),
1px 0 0 0px rgba(255,255,255,.6),
-1px 0 0 0px rgba(255,255,255,.6) !important;
}

/*private browsing - purple */
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button{
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button{
background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important;
}
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%),
radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)),
linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
}
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]) {
#main-window[privatebrowsingmode=temporary]:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox #PanelUI-button #PanelUI-menu-button:is(:hover:active,[open]) {
background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
}

Expand Down Expand Up @@ -237,7 +241,7 @@

/* support for tab title in Firefox titlebar option*/
#main-window:is([tabsintitlebar],[customtitlebar])::after {
margin-inline-start: 45px !important;
margin-inline-start: var(--appbutton_in_titlebar) !important;
}

/* remove this nonsense button, a menuitem is inside menu button anyways */
Expand All @@ -259,6 +263,10 @@
height: unset !important;
}

#TabsToolbar .titlebar-spacer[type="pre-tabs"] {
display: none !important;
}

/* workaround for Firefox 102+ *******************/
panel[id="appMenu-popup"][type="arrow"][side="top"],
panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
Expand All @@ -280,7 +288,7 @@ panel[id="appMenu-popup"][type="arrow"][side="bottom"] {
}

#main-window:is([tabsintitlebar],[customtitlebar]) #TabsToolbar {
padding-inline-end: 100px !important;
padding-inline-end: calc(var(--appbutton_in_titlebar) + 5px) !important;
}

#main-window:is([tabsintitlebar],[customtitlebar]) .titlebar-buttonbox-container {
Expand Down
Loading

0 comments on commit cbf2735

Please sign in to comment.