Skip to content

Commit 7ae9fb3

Browse files
committed
Phoenix rework, fxa panel, sidebar
* Floating tabs tweak no longer affects vertical tabs * Reworked uc.winui.transparent-navbar tweak to recycle the original floating tabs tweak * Shrunk the collapsed sidebar to 48px * Added button shadow/outline style to floating tabs by default * Bookmarks bar and side bar are now transparent when uc.winui.transparent-navbar is enabled * Shrunk the open-window icon in the account panel to pixel-perfect proportions
1 parent 7fa2d66 commit 7ae9fb3

File tree

1 file changed

+153
-148
lines changed

1 file changed

+153
-148
lines changed

chrome/userChrome.css

Lines changed: 153 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -921,11 +921,12 @@ menuitem[command="placesCmd_sortBy:name"] .menu-text::after {
921921
position: absolute;
922922
}
923923
#fxa-manage-account-button::before {
924-
content: url(icons/open-window.svg);
925-
width: 14px;
926-
height: 14px;
924+
content: '';
925+
background: url(icons/open-window.svg) no-repeat center center;
926+
background-size: 14px !important;
927+
width: 16px;
928+
height: 16px;
927929
position: absolute;
928-
margin-left: 1px;
929930
}
930931

931932
#toolbar-context-toggle-vertical-tabs > .menu-text::after,
@@ -3699,6 +3700,12 @@ button:active {
36993700
border-right: 1px solid var(--footerBorder) !important;
37003701
}
37013702

3703+
:root:has(#sidebar-main:not([hidden=""])):not([inFullscreen]) {
3704+
#sidebar-main:not([sidebar-launcher-expanded=""]) {
3705+
width: 48px !important;
3706+
}
3707+
}
3708+
37023709
.sidebar-panel-header {
37033710
margin-top: -8px !important;
37043711
}
@@ -3734,7 +3741,7 @@ splitter[orient="vertical"] {
37343741

37353742
/* Sidebar bottom buttons */
37363743
.actions-list moz-button {
3737-
margin: 4px !important;
3744+
margin: 0 0 0 -4px !important;
37383745
}
37393746

37403747
.wrapper > .buttons-wrapper {
@@ -7163,118 +7170,140 @@ button
71637170
}
71647171
}
71657172

7166-
@media -moz-pref("uc.winui.floating-tabs") {
7167-
.tab-background:not([selected]) {
7168-
clip-path: inset(1px round 7px) !important;
7169-
}
7170-
7171-
/* Fix alignment of private window label */
7172-
.private-browsing-indicator-with-label {
7173-
margin-top: 17px !important;
7174-
}
7175-
:root[sizemode="maximized"] .private-browsing-indicator-with-label {
7176-
margin-top: 9px !important;
7177-
}
7173+
@media -moz-pref("uc.winui.floating-tabs") or -moz-pref('uc.winui.transparent-navbar') {
7174+
@media not -moz-pref('sidebar.VerticalTabs') {
7175+
.tab-background:not([selected]) {
7176+
clip-path: inset(1px round 7px) !important;
7177+
}
71787178

7179-
/* Tab roundness */
7180-
.tab-background {
7181-
border-radius: 8px !important;
7182-
}
7179+
/* Fix alignment of private window label */
7180+
.private-browsing-indicator-with-label {
7181+
margin-top: 17px !important;
7182+
}
7183+
:root[sizemode="maximized"] .private-browsing-indicator-with-label {
7184+
margin-top: 9px !important;
7185+
}
71837186

7184-
/* Bottom tab corners */
7185-
.tabbrowser-tab .tab-stack, .tab-background {
7186-
&::before, &::after {
7187-
content: none !important;
7187+
/* Tab roundness */
7188+
.tab-background {
7189+
border-radius: 8px !important;
71887190
}
7189-
}
71907191

7191-
/* Tab height */
7192-
:root {
7193-
--tab-min-height: 46px !important;
7194-
}
7195-
:root[sizemode="maximized"] {
7196-
--tab-min-height: 36px !important;
7197-
}
7192+
/* Bottom tab corners */
7193+
.tabbrowser-tab .tab-stack, .tab-background {
7194+
&::before, &::after {
7195+
content: none !important;
7196+
}
7197+
}
7198+
7199+
/* Improve tab outline */
7200+
@media (prefers-color-scheme: light) {
7201+
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
7202+
#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
7203+
box-shadow: var(--buttonShadowLight) !important;
7204+
}
7205+
}
7206+
@media (prefers-color-scheme: dark) {
7207+
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
7208+
#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
7209+
box-shadow: var(--buttonShadowDark) !important;
7210+
}
71987211

7199-
/* New tab button - seems to have different effects in 23h2 and 24h2 */
7200-
#TabsToolbar #tabs-newtab-button>.toolbarbutton-icon {
7201-
margin-bottom: -4px !important;
7202-
}
7212+
:root, :root .tabbrowser-tab {
7213+
& [brighttext], & [brighttext] .tabbrowser-tab {
7214+
--uc-titlebar-shadow: none !important;
7215+
}
7216+
}
7217+
}
72037218

7204-
/* Tab close button */
7205-
.tab-close-button {
7206-
margin-top: 2px !important;
7207-
margin-right: 4px !important;
7208-
}
7219+
/* Tab height */
7220+
:root {
7221+
--tab-min-height: 46px !important;
7222+
}
7223+
:root[sizemode="maximized"] {
7224+
--tab-min-height: 36px !important;
7225+
}
72097226

7210-
/* Toolbar icons pinned to the tab area */
7211-
#TabsToolbar .toolbarbutton-1 {
7212-
margin-bottom: 6px !important;
7213-
}
7227+
/* New tab button - seems to have different effects in 23h2 and 24h2 */
7228+
#TabsToolbar #tabs-newtab-button>.toolbarbutton-icon {
7229+
margin-bottom: -4px !important;
7230+
}
72147231

7215-
/* Tab gap up and down */
7216-
:root[sizemode="normal"] #toolbar-menubar,
7217-
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7218-
padding-left: 5px !important;
7219-
margin-top: -5px !important;
7220-
}
7221-
:root[sizemode="maximized"] #toolbar-menubar,
7222-
:root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7223-
padding-left: 6px !important;
7224-
margin-top: -1px !important;
7225-
}
7226-
#tabbrowser-arrowscrollbox,
7227-
#tabbrowser-arrowscrollbox > * {
7228-
margin-bottom: 3px !important;
7229-
margin-top: 3px !important;
7230-
}
7231-
.tab-content {
7232-
margin-bottom: 1px !important;
7233-
margin-left: -1px !important;
7234-
}
7235-
7236-
/* Pinned tabs */
7237-
:root {
7238-
.tabbrowser-tab[pinned="true"] {
7239-
margin: 6px 1px 6px 8px !important;
7232+
/* Tab close button */
7233+
.tab-close-button {
7234+
margin-top: 2px !important;
7235+
margin-right: 4px !important;
72407236
}
7241-
&[sizemode="maximized"] {
7242-
.tabbrowser-tab[pinned="true"] {
7243-
margin: 6px 1px 6px 7px !important;
7244-
}
7237+
7238+
/* Toolbar icons pinned to the tab area */
7239+
#TabsToolbar .toolbarbutton-1 {
7240+
margin-bottom: 6px !important;
72457241
}
7246-
}
7247-
7248-
@media -moz-pref("uc.winui.immersive-navbar") {
7242+
7243+
/* Tab gap up and down */
72497244
:root[sizemode="normal"] #toolbar-menubar,
72507245
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7251-
margin-top: -4.5px !important;
7246+
padding-left: 5px !important;
7247+
margin-top: -5px !important;
72527248
}
72537249
:root[sizemode="maximized"] #toolbar-menubar,
72547250
:root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7255-
margin-top: -.5px !important;
7251+
padding-left: 6px !important;
7252+
margin-top: -1px !important;
7253+
}
7254+
#tabbrowser-arrowscrollbox,
7255+
#tabbrowser-arrowscrollbox > * {
7256+
margin-bottom: 3px !important;
7257+
margin-top: 3px !important;
7258+
}
7259+
.tab-content {
7260+
margin-bottom: 1px !important;
7261+
margin-left: -1px !important;
72567262
}
7257-
}
72587263

7259-
/* Select tab by clicking on the empty space above it */
7260-
#tabbrowser-tabs {
7261-
margin-top: -9px !important;
7264+
/* Pinned tabs */
7265+
:root {
7266+
.tabbrowser-tab[pinned="true"] {
7267+
margin: 6px 1px 6px 8px !important;
7268+
}
7269+
&[sizemode="maximized"] {
7270+
.tabbrowser-tab[pinned="true"] {
7271+
margin: 6px 1px 6px 7px !important;
7272+
}
7273+
}
7274+
}
72627275

7263-
& .tabbrowser-tab,
7264-
& #tabs-newtab-button {
7265-
padding-top: 9px !important;
7276+
@media -moz-pref("uc.winui.immersive-navbar") {
7277+
:root[sizemode="normal"] #toolbar-menubar,
7278+
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7279+
margin-top: -4.5px !important;
7280+
}
7281+
:root[sizemode="maximized"] #toolbar-menubar,
7282+
:root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] + toolbar{
7283+
margin-top: -.5px !important;
7284+
}
7285+
}
7286+
7287+
/* Select tab by clicking on the empty space above it */
7288+
#tabbrowser-tabs {
7289+
margin-top: -9px !important;
7290+
7291+
& .tabbrowser-tab,
7292+
& #tabs-newtab-button {
7293+
padding-top: 9px !important;
7294+
}
7295+
}
7296+
7297+
/* Tab scroll buttons */
7298+
#scrollbutton-up:not(.menupopup-scrollbutton),
7299+
#scrollbutton-down:not(.menupopup-scrollbutton) {
7300+
bottom: 8px !important;
7301+
}
7302+
7303+
/* Fix window control glyphs alignment in windowed mode */
7304+
:root:not([sizemode=maximized]) .titlebar-button {
7305+
margin-top: 9px !important;
72667306
}
7267-
}
7268-
7269-
/* Tab scroll buttons */
7270-
#scrollbutton-up:not(.menupopup-scrollbutton),
7271-
#scrollbutton-down:not(.menupopup-scrollbutton) {
7272-
bottom: 8px !important;
7273-
}
7274-
7275-
/* Fix window control glyphs alignment in windowed mode */
7276-
:root:not([sizemode=maximized]) .titlebar-button {
7277-
margin-top: 9px !important;
72787307
}
72797308
}
72807309

@@ -9565,7 +9594,6 @@ button
95659594
}
95669595
}
95679596

9568-
95699597
/* Tab close button visibility */
95709598
/* Tab close button visible on hover and on selected table */
95719599
@media -moz-pref("uc.winui.tab-close-button", 1) {
@@ -9941,68 +9969,39 @@ button
99419969
}
99429970
/* Transparent navbar to mimic Edge's scrapped phoenix design */
99439971
@media -moz-pref('uc.winui.transparent-navbar') {
9944-
#nav-bar {
9945-
background-color: transparent !important;
9946-
box-shadow: none !important;
9947-
margin-top: -2px !important;
9972+
#nav-bar{
9973+
box-shadow: 0 -1px 0 0 var(--footerBorder) inset !important;
9974+
margin-top: -5px !important;
99489975

99499976
&::before {
99509977
content: none;
99519978
}
99529979
}
9980+
#PersonalToolbar,
9981+
#nav-bar,
9982+
#sidebar-main,
9983+
#sidebar-box,
9984+
#sidebar-splitter,
99539985
#nav-bar:-moz-window-inactive,
9954-
#PersonalToolbar:-moz-window-inactive {
9986+
#PersonalToolbar:-moz-window-inactive,
9987+
#sidebar-box:-moz-window-inactive,
9988+
#sidebar-splitter:-moz-window-inactive{
99559989
background-color: transparent !important;
99569990
}
99579991

9958-
.tab-stack {
9959-
margin-bottom: 2px !important;
9960-
}
9961-
9962-
/* Tabs bar buttons */
9963-
#TabsToolbar .toolbarbutton-1 {
9964-
margin-bottom: 1px !important;
9965-
}
9966-
#scrollbutton-up:not(.menupopup-scrollbutton),
9967-
#scrollbutton-down:not(.menupopup-scrollbutton) {
9968-
bottom: 6px !important;
9969-
}
9970-
9971-
.tabbrowser-tab:is([selected], [multiselected]) > .tab-stack > .tab-background,
9972-
.tabbrowser-tab:is([selected], [multiselected]) > .tab-stack > .tab-background:-moz-window-inactive {
9973-
background-color: var(--button) !important;
9974-
border-radius: 7px !important;
9975-
}
9976-
#tabbrowser-tabs[orient="horizontal"] .tab-background:not([selected]) {
9977-
clip-path: inset(0px 1px round 7px) !important;
9978-
}
9979-
9980-
/* Bottom corners */
9981-
.tabbrowser-tab .tab-stack, .tab-background {
9982-
&::before, &::after {
9983-
content: none !important;
9984-
}
9985-
}
9986-
9987-
@media (prefers-color-scheme: light) {
9988-
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
9989-
#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
9990-
box-shadow: var(--buttonShadowLight) !important;
9992+
/* Rounded upper left corner if the side panel is shown */
9993+
:root:has(#sidebar-main:not([hidden=""])):not([inFullscreen]) {
9994+
& tabbox#tabbrowser-tabbox,
9995+
& #tabbrowser-tabpanels {
9996+
border-radius: 8px 0 0 0 !important;
99919997
}
99929998
}
9993-
@media (prefers-color-scheme: dark) {
9994-
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),
9995-
#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon {
9996-
box-shadow: var(--buttonShadowDark) !important;
9997-
}
9998-
9999-
:root, :root .tabbrowser-tab {
10000-
& [brighttext], & [brighttext] .tabbrowser-tab {
10001-
--uc-titlebar-shadow: none !important;
10002-
}
10003-
}
9999+
10000+
#TabsToolbar {
10001+
box-shadow: unset !important;
1000410002
}
1000510003

10004+
1000610005
/* Rounded corners compatibility */
1000710006
@media -moz-pref("uc.winui.rounded-corners") {
1000810007
:root:not([inDOMFullscreen="true"],
@@ -10109,4 +10108,10 @@ button
1010910108
}
1011010109
}
1011110110
}
10111+
/* Vertical tabs compatibility */
10112+
@media -moz-pref('sidebar.verticalTabs') {
10113+
#nav-bar {
10114+
margin-top: 0 !important;
10115+
}
10116+
}
1011210117
}

0 commit comments

Comments
 (0)