mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2025-12-15 15:20:33 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Tab Bar - Separated tabbar options

Browse source
This commit is contained in:
alstjr7375 2022-08-04 10:03:18 +09:00
parent 48eb45b40d
commit 6a0b56c2ba
15 changed files with 182 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

26
__tests__/one_liner.test.scss
View file

@ -11,10 +11,10 @@
} }
} }
@include expect { @include expect {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@include example; @include example;
} }
@ -31,11 +31,11 @@
} }
} }
@include expect { @include expect {
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@include example; @include example;
} }
@ -55,11 +55,11 @@
} }
} }
@include expect { @include expect {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@include example; @include example;
} }
@ -77,10 +77,10 @@
} }
} }
@include expect { @include expect {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@include example; @include example;
} }
@ -100,11 +100,11 @@
} }
} }
@include expect { @include expect {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@include example; @include example;

200
css/leptonChrome.css
View file

@ -3246,13 +3246,13 @@
--tab-max-width: 225px; --tab-max-width: 225px;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
:root { :root {
--tab-max-width: 180px; --tab-max-width: 180px;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
:root { :root {
--tab-max-width: 180px; --tab-max-width: 180px;
@ -3838,7 +3838,7 @@
} }
/** Tab Bar UI ****************************************************************/ /** Tab Bar UI ****************************************************************/
/*= Tabs on Bottom ===========================================================*/ /*= Tabs on Bottom ===========================================================*/
@supports -moz-bool-pref("userChrome.tab.on_bottom") or -moz-bool-pref("userChrome.fullscreen.overlap") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.fullscreen.overlap") {
/* Don't use display: flex at not fullscreen!! side effect #372 */ /* Don't use display: flex at not fullscreen!! side effect #372 */
:root[sizemode="fullscreen"] #navigator-toolbox { :root[sizemode="fullscreen"] #navigator-toolbox {
display: flex !important; display: flex !important;
@ -3859,8 +3859,8 @@
-moz-appearance: none !important; -moz-appearance: none !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
/*= Tabbar - Move to bottom ==================================================*/ /*= Tabbar - Move to bottom ==================================================*/
@ -3885,14 +3885,14 @@
padding-inline-end: var(--toolbar-start-end-padding, 8px); padding-inline-end: var(--toolbar-start-end-padding, 8px);
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
#PersonalToolbar { #PersonalToolbar {
order: 2; order: 2;
/* When userChrome.fullscreen.overlap */ /* When userChrome.fullscreen.overlap */
-moz-box-ordinal-group: 2; -moz-box-ordinal-group: 2;
} }
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
@supports -moz-bool-pref("userChrome.tab.connect_to_window") { @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
@supports -moz-bool-pref("userChrome.tab.color_like_toolbar") { @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") {
#navigator-toolbox { #navigator-toolbox {
@ -3903,7 +3903,7 @@
} }
} }
/*= Menubar - Always on top ==================================================*/ /*= Menubar - Always on top ==================================================*/
@supports -moz-bool-pref("userChrome.tab.on_bottom.menubar_on_top") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
:root { :root {
@ -3990,8 +3990,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
@ -4017,14 +4017,14 @@
padding-inline-end: var(--toolbar-start-end-padding, 8px); padding-inline-end: var(--toolbar-start-end-padding, 8px);
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
#PersonalToolbar { #PersonalToolbar {
order: 2; order: 2;
/* When userChrome.fullscreen.overlap */ /* When userChrome.fullscreen.overlap */
-moz-box-ordinal-group: 2; -moz-box-ordinal-group: 2;
} }
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
@supports -moz-bool-pref("userChrome.tab.connect_to_window") { @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
@supports -moz-bool-pref("userChrome.tab.color_like_toolbar") { @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") {
#navigator-toolbox { #navigator-toolbox {
@ -4035,7 +4035,7 @@
} }
} }
/*= Menubar - Always on top ==================================================*/ /*= Menubar - Always on top ==================================================*/
@supports -moz-bool-pref("userChrome.tab.on_bottom.menubar_on_top") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom.menubar_on_top") {
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
:root { :root {
@ -4126,8 +4126,8 @@
} }
} }
/*= Tab Bar - Oneliner =======================================================*/ /*= Tab Bar - Oneliner =======================================================*/
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
:root { :root {
--uc-navbar-size: 40vw; --uc-navbar-size: 40vw;
--uc-tabbar-size: calc(100vw - var(--uc-navbar-size)); --uc-tabbar-size: calc(100vw - var(--uc-navbar-size));
@ -4150,7 +4150,7 @@
transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
:root { :root {
--uc-navbar-gap: 10px; --uc-navbar-gap: 10px;
--uc-navbar-block: 1.5px; --uc-navbar-block: 1.5px;
@ -4178,7 +4178,7 @@
/* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */ /* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
#navigator-toolbox { #navigator-toolbox {
background-color: var(--toolbar-bgcolor) !important; background-color: var(--toolbar-bgcolor) !important;
} }
@ -4202,7 +4202,7 @@
display: none !important; display: none !important;
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-start: var(--uc-navbar-margin) !important; margin-inline-start: var(--uc-navbar-margin) !important;
} }
@ -4215,7 +4215,7 @@
display: none !important; display: none !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-end: var(--uc-navbar-margin) !important; margin-inline-end: var(--uc-navbar-margin) !important;
} }
@ -4229,7 +4229,7 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
:root { :root {
--uc-navbar-size: 40vw; --uc-navbar-size: 40vw;
@ -4253,7 +4253,7 @@
transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
:root { :root {
--uc-navbar-gap: 10px; --uc-navbar-gap: 10px;
--uc-navbar-block: 1.5px; --uc-navbar-block: 1.5px;
@ -4281,7 +4281,7 @@
/* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */ /* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
#navigator-toolbox { #navigator-toolbox {
background-color: var(--toolbar-bgcolor) !important; background-color: var(--toolbar-bgcolor) !important;
} }
@ -4305,7 +4305,7 @@
display: none !important; display: none !important;
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-start: var(--uc-navbar-margin) !important; margin-inline-start: var(--uc-navbar-margin) !important;
} }
@ -4318,7 +4318,7 @@
display: none !important; display: none !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-end: var(--uc-navbar-margin) !important; margin-inline-end: var(--uc-navbar-margin) !important;
} }
@ -4335,9 +4335,9 @@
} }
} }
/*= Tab Bar - Shared Layout ==================================================*/ /*= Tab Bar - Shared Layout ==================================================*/
@supports -moz-bool-pref("userChrome.tab.on_bottom") or -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
/*= Windows Control - Move to toolbar ========================================*/ /*= Windows Control - Move to toolbar ========================================*/
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
@ -4428,9 +4428,9 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
/*= Windows Control - Move to toolbar ========================================*/ /*= Windows Control - Move to toolbar ========================================*/
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */
@ -4521,8 +4521,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
/*= Windows Control - Move to toolbar ========================================*/ /*= Windows Control - Move to toolbar ========================================*/
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
@ -4614,7 +4614,7 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
/*= Windows Control - Move to toolbar ========================================*/ /*= Windows Control - Move to toolbar ========================================*/
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
@ -4732,15 +4732,15 @@
/* Remove pre space */ /* Remove pre space */
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
/* Don't need pre spacer */ /* Don't need pre spacer */
--uc-window-drag-space-pre: 0px; --uc-window-drag-space-pre: 0px;
} }
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
/* Don't need window control */ /* Don't need window control */
--uc-window-control-width: 0px; --uc-window-control-width: 0px;
@ -4748,9 +4748,9 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
/* Don't need pre spacer */ /* Don't need pre spacer */
--uc-window-drag-space-pre: 0px; --uc-window-drag-space-pre: 0px;
@ -4761,13 +4761,13 @@
} }
} }
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
/* Don't need pre spacer */ /* Don't need pre spacer */
--uc-window-drag-space-pre: 0px; --uc-window-drag-space-pre: 0px;
} }
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
/* Don't need window control */ /* Don't need window control */
--uc-window-control-width: 0px; --uc-window-control-width: 0px;
@ -4781,21 +4781,21 @@
border-inline-style: solid !important; border-inline-style: solid !important;
border-inline-color: var(--toolbar-bgcolor); border-inline-color: var(--toolbar-bgcolor);
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
#nav-bar { #nav-bar {
border-inline-start-width: var(--uc-window-drag-space-pre); border-inline-start-width: var(--uc-window-drag-space-pre);
border-inline-end-width: var(--uc-widow-control-space); border-inline-end-width: var(--uc-widow-control-space);
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
#nav-bar { #nav-bar {
border-inline-start-width: var(--uc-window-drag-space-pre); border-inline-start-width: var(--uc-window-drag-space-pre);
border-inline-end-width: var(--uc-widow-control-space); border-inline-end-width: var(--uc-widow-control-space);
} }
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
#nav-bar { #nav-bar {
border-inline-start-width: var(--uc-window-drag-space-pre); border-inline-start-width: var(--uc-window-drag-space-pre);
@ -4805,16 +4805,16 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#nav-bar { #nav-bar {
margin-inline-start: var(--uc-window-drag-space-pre) !important; margin-inline-start: var(--uc-window-drag-space-pre) !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
#nav-bar { #nav-bar {
margin-inline-end: var(--uc-widow-control-space) !important; margin-inline-end: var(--uc-widow-control-space) !important;
} }
@ -4845,21 +4845,21 @@
--uc-window-control-width: 72px; --uc-window-control-width: 72px;
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
border-inline-start-width: var(--uc-widow-control-space); border-inline-start-width: var(--uc-widow-control-space);
border-inline-end-width: var(--uc-window-drag-space-pre); border-inline-end-width: var(--uc-window-drag-space-pre);
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
border-inline-start-width: var(--uc-widow-control-space); border-inline-start-width: var(--uc-widow-control-space);
border-inline-end-width: var(--uc-window-drag-space-pre); border-inline-end-width: var(--uc-window-drag-space-pre);
} }
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
border-inline-start-width: var(--uc-widow-control-space); border-inline-start-width: var(--uc-widow-control-space);
@ -4869,16 +4869,16 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
margin-inline-start: var(--uc-window-drag-space-pre, 0px) !important; margin-inline-start: var(--uc-window-drag-space-pre, 0px) !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
margin-inline-end: var(--uc-widow-control-space, 0px) !important; margin-inline-end: var(--uc-widow-control-space, 0px) !important;
} }
@ -4895,7 +4895,7 @@
} }
} }
/*= Tab Bar - Show only current tab ==========================================*/ /*= Tab Bar - Show only current tab ==========================================*/
@supports -moz-bool-pref("userChrome.tab.as_titlebar") { @supports -moz-bool-pref("userChrome.tabbar.as_titlebar") {
:root:not([tabsintitlebar="true"]) #tabbrowser-tabs, :root:not([tabsintitlebar="true"]) #tabbrowser-tabs,
#scrollbutton-up, #scrollbutton-up,
#scrollbutton-down, #scrollbutton-down,
@ -5375,15 +5375,15 @@
opacity: var(--tab-separator-opacity); opacity: var(--tab-separator-opacity);
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
.tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before { .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before {
opacity: var(--tab-separator-opacity); opacity: var(--tab-separator-opacity);
transform: translateX(-1.5px) translateY(calc(-50% + 1px)); transform: translateX(-1.5px) translateY(calc(-50% + 1px));
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
.tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before { .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before {
opacity: var(--tab-separator-opacity); opacity: var(--tab-separator-opacity);
@ -5779,7 +5779,7 @@
} }
/** Clipped tabs - Show close button at pinned tab ****************************/ /** Clipped tabs - Show close button at pinned tab ****************************/
@supports -moz-bool-pref("userChrome.tab.close_button_at_pinned") { @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned") {
@supports not -moz-bool-pref("userChrome.tab.as_titlebar") { @supports not -moz-bool-pref("userChrome.tabbar.as_titlebar") {
#tabbrowser-tabs { #tabbrowser-tabs {
--uc-close-button-size: 24px; --uc-close-button-size: 24px;
--uc-close-button-padding: 6px; --uc-close-button-padding: 6px;
@ -6460,7 +6460,7 @@
@supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref( @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref(
"userChrome.autohide.bookmarkbar" "userChrome.autohide.bookmarkbar"
) )
or -moz-bool-pref("userChrome.tab.one_liner") { or -moz-bool-pref("userChrome.tabbar.one_liner") {
:root { :root {
--uc-tabbar-height: var(--tab-min-height); --uc-tabbar-height: var(--tab-min-height);
--uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height)); --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
@ -6518,7 +6518,7 @@
} }
} }
@supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") {
@supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
#navigator-toolbox:hover { #navigator-toolbox:hover {
--uc-toolbar-height: var(--uc-tabbar-height); --uc-toolbar-height: var(--uc-tabbar-height);
} }
@ -6529,7 +6529,7 @@
} }
} }
} }
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") { @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
#navigator-toolbox:hover { #navigator-toolbox:hover {
--uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height)); --uc-toolbar-height: calc(var(--uc-tabbar-height) + var(--uc-navbar-height));
@ -6541,8 +6541,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") { @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
@ -6569,8 +6569,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") { @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
#navigator-toolbox:hover { #navigator-toolbox:hover {
--uc-toolbar-height: var(--uc-navbar-height); --uc-toolbar-height: var(--uc-navbar-height);
@ -6582,8 +6582,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") { @supports not -moz-bool-pref("userChrome.autohide.bookmarkbar") {
@ -6605,20 +6605,20 @@
} }
} }
@supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") {
@supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
:root:not([customizing]) #titlebar { :root:not([customizing]) #titlebar {
margin-bottom: var(--uc-tabbar-hide-height); margin-bottom: var(--uc-tabbar-hide-height);
will-change: margin-bottom; will-change: margin-bottom;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) { #TabsToolbar:not([customizing]) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
@ -6628,31 +6628,31 @@
#navigator-toolbox:is(:hover, :focus-within) > #titlebar { #navigator-toolbox:is(:hover, :focus-within) > #titlebar {
margin-bottom: 0px; margin-bottom: 0px;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
opacity: 1; opacity: 1;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
opacity: 1; opacity: 1;
} }
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
:root:not([customizing]) #titlebar { :root:not([customizing]) #titlebar {
margin-bottom: var(--uc-tabbar-hide-height); margin-bottom: var(--uc-tabbar-hide-height);
will-change: margin-bottom; will-change: margin-bottom;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) { #TabsToolbar:not([customizing]) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
@ -6662,12 +6662,12 @@
#navigator-toolbox:is(:hover, :focus-within) > #titlebar { #navigator-toolbox:is(:hover, :focus-within) > #titlebar {
margin-bottom: 0px; margin-bottom: 0px;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
opacity: 1; opacity: 1;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
opacity: 1; opacity: 1;
} }
@ -6679,13 +6679,13 @@
will-change: margin-bottom; will-change: margin-bottom;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) { #TabsToolbar:not([customizing]) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
opacity: 0; opacity: 0;
will-change: opacity; will-change: opacity;
@ -6695,12 +6695,12 @@
#navigator-toolbox:is(:hover, :focus-within) > #titlebar { #navigator-toolbox:is(:hover, :focus-within) > #titlebar {
margin-bottom: 0px; margin-bottom: 0px;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
opacity: 1; opacity: 1;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar > *:not(.titlebar-buttonbox-container) {
opacity: 1; opacity: 1;
} }
@ -6713,12 +6713,12 @@
background-color 1s var(--animation-easing-function) !important; background-color 1s var(--animation-easing-function) !important;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) { #TabsToolbar:not([customizing]) {
transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important; transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important; transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important;
} }
@ -6730,12 +6730,12 @@
#navigator-toolbox:is(:hover, :focus-within) > #titlebar:not([customizing]) { #navigator-toolbox:is(:hover, :focus-within) > #titlebar:not([customizing]) {
transition-delay: 0s !important; transition-delay: 0s !important;
} }
@supports not -moz-bool-pref("userChrome.tab.on_bottom") { @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) { #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) {
transition-delay: 0s !important; transition-delay: 0s !important;
} }
} }
@supports -moz-bool-pref("userChrome.tab.on_bottom") { @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
#navigator-toolbox:is(:hover, :focus-within) #navigator-toolbox:is(:hover, :focus-within)
#TabsToolbar:not([customizing]) #TabsToolbar:not([customizing])
> *:not(.titlebar-buttonbox-container) { > *:not(.titlebar-buttonbox-container) {
@ -6744,8 +6744,8 @@
} }
} }
} }
@supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports not -moz-bool-pref("userChrome.tab.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") {
#nav-bar:not([customizing]) { #nav-bar:not([customizing]) {
margin-bottom: var(--uc-navbar-hide-height); margin-bottom: var(--uc-navbar-hide-height);
opacity: 0; opacity: 0;
@ -6757,8 +6757,8 @@
opacity: 1; opacity: 1;
} }
} }
@supports -moz-bool-pref("userChrome.tab.one_liner") { @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
@supports -moz-bool-pref("userChrome.tab.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
@supports -moz-bool-pref("userChrome.autohide.navbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
#nav-bar:not([customizing]) { #nav-bar:not([customizing]) {

2
src/autohide/_common.scss
View file

@ -1,4 +1,4 @@
@include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.tab.one_liner") { @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.tabbar.one_liner") {
:root { :root {
--uc-tabbar-height: var(--tab-min-height); // calc((var(--tab-block-margin) * 2) + var(--tab-min-height)); --uc-tabbar-height: var(--tab-min-height); // calc((var(--tab-block-margin) * 2) + var(--tab-min-height));
--uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height)); --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));

4
src/autohide/_index.scss
View file

@ -14,10 +14,10 @@
@import "common"; @import "common";
@include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar") { @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar") {
@include Option("userChrome.autohide.tabbar", "userChrome.tab.one_liner") { @include Option("userChrome.autohide.tabbar", "userChrome.tabbar.one_liner") {
@import "tabbar"; @import "tabbar";
} }
@include Option("userChrome.autohide.navbar", "userChrome.tab.one_liner") { @include Option("userChrome.autohide.navbar", "userChrome.tabbar.one_liner") {
@import "navbar"; @import "navbar";
} }
} }

4
src/autohide/_tabbar.scss
View file

@ -1,9 +1,9 @@
//-- Mixin --------------------------------------------------------------------- //-- Mixin ---------------------------------------------------------------------
@mixin _autohide_tabbar() { @mixin _autohide_tabbar() {
@include NotOption("userChrome.tab.on_bottom") { @include NotOption("userChrome.tabbar.on_bottom") {
@content; @content;
} }
@include Option("userChrome.tab.on_bottom") { @include Option("userChrome.tabbar.on_bottom") {
> *:not(.titlebar-buttonbox-container) { > *:not(.titlebar-buttonbox-container) {
@content; @content;
} }

4
src/autohide/_toolbar_overlap.scss
View file

@ -27,7 +27,7 @@
&:hover { &:hover {
@include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar") { @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar") {
@include Option("userChrome.autohide.tabbar", "userChrome.tab.one_liner") { @include Option("userChrome.autohide.tabbar", "userChrome.tabbar.one_liner") {
--uc-toolbar-height: var(--uc-tabbar-height); --uc-toolbar-height: var(--uc-tabbar-height);
@include NotOption("userChrome.autohide.navbar") { @include NotOption("userChrome.autohide.navbar") {
@ -53,7 +53,7 @@
} }
} }
@include Option("userChrome.autohide.navbar", "userChrome.tab.one_liner") { @include Option("userChrome.autohide.navbar", "userChrome.tabbar.one_liner") {
@include OneLinerNavbar { @include OneLinerNavbar {
@include NotOption("userChrome.autohide.bookmarkbar") { @include NotOption("userChrome.autohide.bookmarkbar") {
--uc-toolbar-height: var(--uc-navbar-height); --uc-toolbar-height: var(--uc-navbar-height);

2
src/tab/_clipped_tab.scss
View file

@ -10,7 +10,7 @@
/** Clipped tabs - Show close button at pinned tab ****************************/ /** Clipped tabs - Show close button at pinned tab ****************************/
@include Option("userChrome.tab.close_button_at_pinned") { @include Option("userChrome.tab.close_button_at_pinned") {
@include NotOption("userChrome.tab.as_titlebar") { @include NotOption("userChrome.tabbar.as_titlebar") {
@import "clipped_tab/pinned_close_button"; @import "clipped_tab/pinned_close_button";
} }
} }

4
src/tab/unselected_tab/_dynamic_separator.scss
View file

@ -57,8 +57,8 @@
.tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-child) .tab-background::before { .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-child) .tab-background::before {
opacity: var(--tab-separator-opacity); opacity: var(--tab-separator-opacity);
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include NotOption("userChrome.tab.one_liner.tabbar_first") { @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
@include OneLinerContent { @include OneLinerContent {
.tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before { .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-background::before {
opacity: var(--tab-separator-opacity); opacity: var(--tab-separator-opacity);

10
src/tabbar/_index.scss
View file

@ -1,5 +1,5 @@
/*= Tabs on Bottom ===========================================================*/ /*= Tabs on Bottom ===========================================================*/
@include Option("userChrome.tab.on_bottom", "userChrome.fullscreen.overlap") { @include Option("userChrome.tabbar.on_bottom", "userChrome.fullscreen.overlap") {
/* Don't use display: flex at not fullscreen!! side effect #372 */ /* Don't use display: flex at not fullscreen!! side effect #372 */
:root[sizemode="fullscreen"] #navigator-toolbox { :root[sizemode="fullscreen"] #navigator-toolbox {
display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */ display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
@ -19,9 +19,9 @@
} }
} }
@include Option("userChrome.tab.on_bottom") { @include Option("userChrome.tabbar.on_bottom") {
@include OneLinerOnBottom { @include OneLinerOnBottom {
@import "tabs_on_bottom"; @import "on_bottom";
} }
} }
@ -31,11 +31,11 @@
} }
/*= Tab Bar - Shared Layout ==================================================*/ /*= Tab Bar - Shared Layout ==================================================*/
@include Option("userChrome.tab.on_bottom", "userChrome.tab.one_liner") { @include Option("userChrome.tabbar.on_bottom", "userChrome.tabbar.one_liner") {
@import "layout"; @import "layout";
} }
/*= Tab Bar - Show only current tab ==========================================*/ /*= Tab Bar - Show only current tab ==========================================*/
@include Option("userChrome.tab.as_titlebar") { @include Option("userChrome.tabbar.as_titlebar") {
@import "as_titlebar"; @import "as_titlebar";
} }

16
src/tabbar/_layout.scss
View file

@ -1,21 +1,21 @@
@include NotOption("userChrome.tab.one_liner") { @include NotOption("userChrome.tabbar.one_liner") {
@include Option("userChrome.tab.on_bottom") { @include Option("userChrome.tabbar.on_bottom") {
@import "layout/window_control"; @import "layout/window_control";
} }
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include NotOption("userChrome.tab.one_liner.responsive") { @include NotOption("userChrome.tabbar.one_liner.responsive") {
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
@import "layout/window_control"; @import "layout/window_control";
} }
} }
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@include Option("userChrome.tab.on_bottom") { @include Option("userChrome.tabbar.on_bottom") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@import "layout/window_control"; @import "layout/window_control";
} }
} }
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@import "layout/window_control"; @import "layout/window_control";
} }

6
src/tabbar/_tabs_on_bottom.scss → src/tabbar/_on_bottom.scss
View file

@ -20,13 +20,13 @@ See the above repository for updates as well as full license text. */
padding-inline-end: var(--toolbar-start-end-padding, 8px); padding-inline-end: var(--toolbar-start-end-padding, 8px);
} }
@include Option("userChrome.tab.on_bottom.above_bookmark") { @include Option("userChrome.tabbar.on_bottom.above_bookmark") {
#PersonalToolbar { #PersonalToolbar {
order: 2; /* When userChrome.fullscreen.overlap */ order: 2; /* When userChrome.fullscreen.overlap */
-moz-box-ordinal-group: 2; -moz-box-ordinal-group: 2;
} }
} }
@include NotOption("userChrome.tab.on_bottom.above_bookmark") { @include NotOption("userChrome.tabbar.on_bottom.above_bookmark") {
@include Option("userChrome.tab.connect_to_window") { @include Option("userChrome.tab.connect_to_window") {
@include Option("userChrome.tab.color_like_toolbar") { @include Option("userChrome.tab.color_like_toolbar") {
#navigator-toolbox { #navigator-toolbox {
@ -37,7 +37,7 @@ See the above repository for updates as well as full license text. */
} }
/*= Menubar - Always on top ==================================================*/ /*= Menubar - Always on top ==================================================*/
@include Option("userChrome.tab.on_bottom.menubar_on_top") { @include Option("userChrome.tabbar.on_bottom.menubar_on_top") {
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_menubar_on_top_patch.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */ See the above repository for updates as well as full license text. */

8
src/tabbar/_one_liner.scss
View file

@ -20,7 +20,7 @@
transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); transform: translateY(calc(-1 * var(--uc-navbar-block, 0px)));
} }
@include NotOption("userChrome.tab.one_liner.combine_navbar") { @include NotOption("userChrome.tabbar.one_liner.combine_navbar") {
:root { :root {
--uc-navbar-gap: 10px; --uc-navbar-gap: 10px;
--uc-navbar-block: 1.5px; // var(--tab-block-margin) or var(--tabs-navbar-shadow-size) --uc-navbar-block: 1.5px; // var(--tab-block-margin) or var(--tabs-navbar-shadow-size)
@ -48,7 +48,7 @@
} }
} }
@include Option("userChrome.tab.one_liner.combine_navbar") { @include Option("userChrome.tabbar.one_liner.combine_navbar") {
#navigator-toolbox { #navigator-toolbox {
background-color: var(--toolbar-bgcolor) !important; background-color: var(--toolbar-bgcolor) !important;
} }
@ -74,7 +74,7 @@ toolbarspring.chromeclass-toolbar-additional {
display: none !important; display: none !important;
} }
@include NotOption("userChrome.tab.one_liner.tabbar_first") { @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-start: var(--uc-navbar-margin) !important; margin-inline-start: var(--uc-navbar-margin) !important;
} }
@ -85,7 +85,7 @@ toolbarspring.chromeclass-toolbar-additional {
display: none !important; display: none !important;
} }
} }
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
#TabsToolbar { #TabsToolbar {
margin-inline-end: var(--uc-navbar-margin) !important; margin-inline-end: var(--uc-navbar-margin) !important;
} }

38
src/tabbar/layout/_navbar_padding.scss
View file

@ -29,24 +29,24 @@
} }
@mixin _remove_spacer_oneLiner() { @mixin _remove_spacer_oneLiner() {
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
@include _remove_spacer_pre; @include _remove_spacer_pre;
} }
@include NotOption("userChrome.tab.one_liner.tabbar_first") { @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
@include _remove_spacer_post; @include _remove_spacer_post;
} }
} }
@mixin _oneLiner_navBar_borderPadding() { @mixin _oneLiner_navBar_borderPadding() {
@include NotOption("userChrome.tab.one_liner") { @include NotOption("userChrome.tabbar.one_liner") {
@content; @content;
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include Option("userChrome.tab.one_liner.combine_navbar") { @include Option("userChrome.tabbar.one_liner.combine_navbar") {
@content; @content;
} }
@include NotOption("userChrome.tab.one_liner.combine_navbar") { @include NotOption("userChrome.tabbar.one_liner.combine_navbar") {
@include Option("userChrome.tab.on_bottom") { @include Option("userChrome.tabbar.on_bottom") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@content; @content;
} }
@ -56,8 +56,8 @@
} }
@mixin _oneLiner_navBar_marginGap() { @mixin _oneLiner_navBar_marginGap() {
@include NotOption("userChrome.tab.one_liner.combine_navbar") { @include NotOption("userChrome.tabbar.one_liner.combine_navbar") {
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@content; @content;
} }
@ -67,14 +67,14 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
:root:is([tabsintitlebar], [sizemode="fullscreen"]) { :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
@include NotOption("userChrome.tab.one_liner.responsive") { @include NotOption("userChrome.tabbar.one_liner.responsive") {
@include _remove_spacer_oneLiner; @include _remove_spacer_oneLiner;
} }
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@include NotOption("userChrome.tab.on_bottom") { @include NotOption("userChrome.tabbar.on_bottom") {
@include _remove_spacer_pre; @include _remove_spacer_pre;
@include _remove_spacer_post; @include _remove_spacer_post;
} }
@ -95,12 +95,12 @@
border-inline-end-width: var(--uc-widow-control-space); border-inline-end-width: var(--uc-widow-control-space);
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include _oneLiner_navBar_marginGap { @include _oneLiner_navBar_marginGap {
@include NotOption("userChrome.tab.one_liner.tabbar_first") { @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
margin-inline-start: var(--uc-window-drag-space-pre) !important; margin-inline-start: var(--uc-window-drag-space-pre) !important;
} }
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
margin-inline-end: var(--uc-widow-control-space) !important; margin-inline-end: var(--uc-widow-control-space) !important;
} }
} }
@ -132,12 +132,12 @@
border-inline-end-width: var(--uc-window-drag-space-pre); border-inline-end-width: var(--uc-window-drag-space-pre);
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include _oneLiner_navBar_marginGap { @include _oneLiner_navBar_marginGap {
@include NotOption("userChrome.tab.one_liner.tabbar_first") { @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
margin-inline-start: var(--uc-window-drag-space-pre, 0px) !important; margin-inline-start: var(--uc-window-drag-space-pre, 0px) !important;
} }
@include Option("userChrome.tab.one_liner.tabbar_first") { @include Option("userChrome.tabbar.one_liner.tabbar_first") {
margin-inline-end: var(--uc-widow-control-space, 0px) !important; margin-inline-end: var(--uc-widow-control-space, 0px) !important;
} }
} }

22
src/utils/_one_liner.scss
View file

@ -1,10 +1,10 @@
@use "option" as *; @use "option" as *;
@mixin OneLinerContent() { @mixin OneLinerContent() {
@include NotOption("userChrome.tab.one_liner.responsive") { @include NotOption("userChrome.tabbar.one_liner.responsive") {
@content; @content;
} }
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@content; @content;
} }
@ -12,7 +12,7 @@
} }
@mixin OneLiner() { @mixin OneLiner() {
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include OneLinerContent { @include OneLinerContent {
@content; @content;
} }
@ -20,11 +20,11 @@
} }
@mixin OneLinerOnBottom() { @mixin OneLinerOnBottom() {
@include NotOption("userChrome.tab.one_liner") { @include NotOption("userChrome.tabbar.one_liner") {
@content; @content;
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@content; @content;
} }
@ -33,10 +33,10 @@
} }
@mixin OneLinerTabbar() { @mixin OneLinerTabbar() {
@include NotOption("userChrome.tab.one_liner.responsive") { @include NotOption("userChrome.tabbar.one_liner.responsive") {
@content; @content;
} }
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@media screen and (min-width: 1100px) { @media screen and (min-width: 1100px) {
@content; @content;
} }
@ -47,11 +47,11 @@
} }
@mixin OneLinerNavbar() { @mixin OneLinerNavbar() {
@include NotOption("userChrome.tab.one_liner") { @include NotOption("userChrome.tabbar.one_liner") {
@content; @content;
} }
@include Option("userChrome.tab.one_liner") { @include Option("userChrome.tabbar.one_liner") {
@include Option("userChrome.tab.one_liner.responsive") { @include Option("userChrome.tabbar.one_liner.responsive") {
@include Option("userChrome.autohide.navbar") { @include Option("userChrome.autohide.navbar") {
@media screen and (max-width: 1100px) { @media screen and (max-width: 1100px) {
@content; @content;

17
user.js
View file

@ -107,14 +107,15 @@ user_pref("userChrome.rounding.square_tab", false);
// user_pref("userChrome.urlView.go_button_when_typing", true); // user_pref("userChrome.urlView.go_button_when_typing", true);
// user_pref("userChrome.urlView.always_show_page_actions", true); // user_pref("userChrome.urlView.always_show_page_actions", true);
// user_pref("userChrome.tab.on_bottom", true); // user_pref("userChrome.tabbar.as_titlebar", true);
// user_pref("userChrome.tab.on_bottom.above_bookmark", true); // Need on_bottom // user_pref("userChrome.tabbar.on_bottom", true);
// user_pref("userChrome.tab.on_bottom.menubar_on_top", true); // Need on_bottom // user_pref("userChrome.tabbar.on_bottom.above_bookmark", true); // Need on_bottom
// user_pref("userChrome.tab.one_liner", true); // user_pref("userChrome.tabbar.on_bottom.menubar_on_top", true); // Need on_bottom
// user_pref("userChrome.tab.one_liner.combine_navbar", true); // user_pref("userChrome.tabbar.one_liner", true);
// user_pref("userChrome.tab.one_liner.tabbar_first", true); // user_pref("userChrome.tabbar.one_liner.combine_navbar", true); // Need one_liner
// user_pref("userChrome.tab.one_liner.responsive", true); // user_pref("userChrome.tabbar.one_liner.tabbar_first", true); // Need one_liner
// user_pref("userChrome.tab.as_titlebar", true); // user_pref("userChrome.tabbar.one_liner.responsive", true); // Need one_liner
// user_pref("userChrome.tab.always_show_tab_icon", true); // user_pref("userChrome.tab.always_show_tab_icon", true);
// user_pref("userChrome.tab.close_button_at_pinned", true); // user_pref("userChrome.tab.close_button_at_pinned", true);
// user_pref("userChrome.tab.close_button_at_pinned.always", true); // user_pref("userChrome.tab.close_button_at_pinned.always", true);