Siklos/edge-frfox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'upstream'

Browse source
This commit is contained in:
Hydroxycarbamide 2023-11-25 00:08:23 +01:00
commit 5eb6f0fe6b
24 changed files with 697 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chrome/toolbar/findbar.css
View file

@ -32,11 +32,11 @@
.close-icon:not([disabled]):hover,
.findbar-find-previous:not([disabled]):hover,
.findbar-find-next:not([disabled]):hover {
background: var(--toolbarbutton-hover-background, rgba(190,190,190,.2)) !important;
background: var(--toolbarbutton-hover-background, rgb(190 190 190 / .2)) !important;
}
.close-icon:not([disabled]):hover:active,
.findbar-find-previous:not([disabled]):hover:active,
.findbar-find-next:not([disabled]):hover:active {
background: var(--toolbarbutton-active-background, rgba(190,190,190,.4)) !important;
background: var(--toolbarbutton-active-background, rgb(190 190 190 / .4)) !important;
}

2
chrome/toolbar/navbar.css
View file

@ -27,7 +27,7 @@
padding: var(--toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important;
}
@supports (-moz-bool-pref("uc.tweak.rounded-corners")) {
@media (-moz-bool-pref: "uc.tweak.rounded-corners") {
#navigator-toolbox {
border-bottom: none !important;
}

39
chrome/toolbar/personalbar.css
View file

@ -4,39 +4,60 @@
--bookmark-block-padding: 6px !important;
}
/* Bookmarks bar item sizing */
#personal-toolbar-empty-description,
#PersonalToolbar .toolbarbutton-1,
toolbarbutton.bookmark-item:not(.subviewbutton) {
margin-block: 0 4px !important;
padding: var(--bookmark-block-padding) 6px !important;
margin-block: 2px 4px !important;
padding-block: var(--bookmark-block-padding) !important;
padding-inline: 6px !important;
font-size: 12px !important;
/* Adjust vertical label position on Windows */
@media (-moz-platform: windows) {
& .toolbarbutton-text {
margin-block: -1px 0 !important;
}
}
}
#PersonalToolbar .toolbarbutton-1 {
padding: 0 !important;
}
#PlacesToolbarItems>toolbarseparator::before {
content: "";
display: block;
border-inline-start: 1px solid var(--toolbarseparator-color) !important;
margin-block: 6px 10px !important;
border-image-source: none !important;
/* Bookmarks bar separators */
#PlacesToolbarItems > toolbarseparator {
padding-inline: 1px !important;
&::before {
content: "";
display: block;
border-inline-start: 1px solid var(--toolbarseparator-color) !important;
margin-block: 8px 10px !important;
border-image-source: none !important;
}
}
/* Left and Right padding of bookmarks bar */
#PersonalToolbar {
padding-inline: calc(var(--toolbar-start-end-padding) - 2px) calc(var(--toolbar-start-end-padding) + 6px) !important;
}
/* Spacing between icon and label for bookmarks bar items */
#managed-bookmarks>.toolbarbutton-icon,
#bookmarks-toolbar-placeholder>.toolbarbutton-icon,
#PlacesToolbarItems>.bookmark-item>.toolbarbutton-icon[label]:not([label=""]),
#OtherBookmarks.bookmark-item[container]>.toolbarbutton-icon {
margin-inline-end: 6px !important;
margin-inline-end: 8px !important;
}
/* Sizing for bookmarks bar icons */
#PersonalToolbar .toolbarbutton-1>.toolbarbutton-icon {
width: calc(2 * var(--bookmark-block-padding) + 16px) !important;
height: calc(2 * var(--bookmark-block-padding) + 16px) !important;
padding: var(--bookmark-block-padding) !important;
}
:root {
--bookmarks-toolbar-overlapping-browser-height: 34px !important;
}

192
chrome/toolbar/tabbar.css
View file

@ -1,29 +1,25 @@
/* Edge-Frfox - tabbar.css */
@supports -moz-bool-pref("uc.tweak.floating-tabs.equal-margin") and -moz-bool-pref("uc.tweak.floating-tabs") {
:root #titlebar {
:root {
--tab-block-margin: 8px !important;
& #titlebar {
--tab-min-height: 32px !important;
--inline-tab-padding: 11px !important;
--tab-border-radius: 4px !important;
--uc-toolbarbutton-inner-padding: 6px !important;
--toolbarbutton-border-radius: 4px !important;
--toolbarbutton-tabsline-border-radius: 8px !important;
--tabs-navbar-shadow-size: 0 !important;
--tab-shadow-max-size: 0 !important;
}
@media (-moz-bool-pref: "uc.tweak.floating-tabs.equal-margin") and (-moz-bool-pref: "uc.tweak.floating-tabs") {
--tab-block-margin: 5px !important;
}
}
@supports (not -moz-bool-pref("uc.tweak.floating-tabs.equal-margin")) or (not -moz-bool-pref("uc.tweak.floating-tabs")) {
:root #titlebar {
--tab-block-margin: 8px !important;
}
}
:root #titlebar {
--tab-min-height: 32px !important;
--inline-tab-padding: 11px !important;
--tab-border-radius: 4px !important;
--uc-toolbarbutton-inner-padding: 6px !important;
--toolbarbutton-border-radius: 4px !important;
--toolbarbutton-tabsline-border-radius: 8px !important;
--tabs-navbar-shadow-size: 0 !important;
--tab-shadow-max-size: 0 !important;
}
/* tab open/close transition */
.tabbrowser-tab:not([pinned]) {
transition-property: min-width, max-width !important;
@ -37,13 +33,13 @@
transition: transform 200ms cubic-bezier(0, .75, .25, 1) !important;
}
:root:is([inFullscreen], :not([tabsintitlebar])) #titlebar {
:root:is([inFullscreen], :not([tabsintitlebar])) {
--tab-block-margin: 0px !important;
}
/* hide space above tabs when maximised for non-macOS versions of Firefox */
@media not (-moz-platform: macos) {
:root:is([inFullscreen], :not([tabsintitlebar]), [sizemode="maximized"]) #titlebar,
:root:is([inFullscreen], :not([tabsintitlebar]), [sizemode="maximized"]),
#toolbar-menubar:not([inactive])+#TabsToolbar {
--tab-block-margin: 0px !important;
}
@ -57,33 +53,41 @@
border: 0 !important;
position: relative !important;
--uc-tab-corner-bg: transparent;
/* Rounded bottom corners */
&::before,
&::after {
content: "" !important;
display: block !important;
position: absolute !important;
width: 8px !important;
height: 8px !important;
bottom: 0 !important;
pointer-events: none !important;
clip-path: inset(0);
}
&::before {
border-bottom-right-radius: var(--tab-border-radius) !important;
left: 0 !important;
transform: translateX(-8px) !important;
box-shadow: 4px 4px 0 4px var(--uc-tab-corner-bg) !important;
}
&::after {
border-bottom-left-radius: var(--tab-border-radius) !important;
right: 0 !important;
transform: translateX(8px) !important;
box-shadow: -4px 4px 0 4px var(--uc-tab-corner-bg) !important;
}
}
/* rounded bottom corners */
.tab-background::before,
.tab-background::after {
content: "" !important;
display: block !important;
position: absolute !important;
width: 8px !important;
height: 8px !important;
bottom: 0 !important;
pointer-events: none !important;
clip-path: inset(0);
}
.tab-background::before {
border-bottom-right-radius: var(--tab-border-radius) !important;
left: 0 !important;
transform: translateX(-8px) !important;
box-shadow: 4px 4px 0 4px var(--uc-tab-corner-bg) !important;
}
.tab-background::after {
.tabbrowser-tab:where([selected], [multiselected], :hover) + .tabbrowser-tab:not([selected]) .tab-background {
border-bottom-left-radius: var(--tab-border-radius) !important;
right: 0 !important;
transform: translateX(8px) !important;
box-shadow: -4px 4px 0 4px var(--uc-tab-corner-bg) !important;
&::before {
--uc-tab-corner-bg: transparent !important;
}
}
.tab-background:is([selected], [multiselected]) {
@ -95,7 +99,7 @@
--uc-tab-corner-bg: color-mix(in srgb, currentColor 8%, transparent) !important;
}
@supports not -moz-bool-pref("uc.tweak.floating-tabs") {
@media not (-moz-bool-pref: "uc.tweak.floating-tabs") {
#Tabstoolbar:not([brighttext]) .tabbrowser-tab:hover .tab-background:not([selected], [multiselected]) {
background-color: color-mix(in srgb, white 30%, transparent) !important;
--uc-tab-corner-bg: color-mix(in srgb, white 30%, transparent) !important;
@ -265,13 +269,15 @@
padding: 0 12px !important;
}
.tabbrowser-tab[usercontextid]>.tab-stack>.tab-background>.tab-context-line {
height: 8px !important;
clip-path: inset(0 0 6px) !important;
border-radius: var(--tab-border-radius) !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
margin: 0 !important;
/* Tab container indicator */
.tabbrowser-tab[usercontextid] .tab-background .tab-context-line {
height: 2px !important;
border-radius: 2px !important;
margin: 2px 7px 0 !important;
}
.tabbrowser-tab[selected][usercontextid] .tab-background .tab-context-line {
margin-inline: 9px !important;
}
.titlebar-spacer[type="post-tabs"] {
@ -294,26 +300,49 @@ toolbarbutton[part="scrollbutton-down"] {
max-width: 240px !important;
}
/* tab separators */
.tabbrowser-tab:not([last-visible-tab="true"]) {
margin-inline-end: 3px !important;
/* Tab separators */
.tabbrowser-tab .tab-stack {
&::before,
&::after {
content: "";
position: absolute;
height: 20px;
inset: 0 auto;
margin-block: auto;
border-left: 1px solid transparent;
}
&::before {
left: 0;
}
&::after {
right: 0;
}
}
.tabbrowser-tab:not([selected="true"], :hover, [beforeselected-visible], [beforehovered]) .tab-stack::after {
content: "";
position: absolute;
display: block;
height: 20px;
right: -1px;
top: 6px;
border-right: 1px solid color-mix(in srgb, currentColor 34%, transparent);
/* Set separator color */
.tabbrowser-tab:not([selected], [multiselected], :hover) {
& .tab-stack::before,
&:last-of-type .tab-stack::after {
border-color: color-mix(in srgb, currentColor 34%, transparent);
}
}
/* need layout.css.has-selector.enabled */
.tabbrowser-tab:has(+ .tabbrowser-tab:is([selected="true"], :hover, [beforeselected-visible], [beforehovered])) .tab-stack::after {
display: none;
/* Hide separator when previous sibling is hovered or selected */
.tabbrowser-tab:where([selected], [multiselected], :hover) + .tabbrowser-tab:not([selected], [multiselected], :hover) .tab-stack::before {
border-color: transparent !important;
}
/* Hide first tab separator if there are no buttons before it (Such as Firefox View) */
#TabsToolbar-customization-target > #tabbrowser-tabs:not(toolbarbutton:not(#fxa-toolbar-menu-button) + #tabbrowser-tabs) .tabbrowser-tab:first-of-type .tab-stack::before {
border-color: transparent !important;
}
/* .tabbrowser-tab:not([last-visible-tab="true"]) {
margin-inline-end: -1px !important;
} */
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])>#tabbrowser-arrowscrollbox>.tabbrowser-tab[first-visible-unpinned-tab] {
margin-inline-start: 0 !important;
}
@ -354,11 +383,20 @@ toolbarbutton[part="scrollbutton-down"] {
margin-top: calc(2px + var(--tab-block-margin)) !important;
}
#tabbrowser-tabs:not([overflow="true"]) .tabbrowser-tab:first-of-type {
margin-inline-start: 14px !important;
/* add margin to tabs if they are the first or last tab */
#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab {
&:first-of-type {
margin-inline-start: 14px !important;
}
&:last-of-type {
margin-inline-end: 6px !important;
}
}
#tabbrowser-tabs:not([overflow="true"]) .tabbrowser-tab:last-of-type {
margin-inline-end: 6px !important;
/* remove gap between pinned and unpinned tabs */
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {
margin-inline-start: 0 !important;
}
#tabbrowser-tabs {
@ -375,21 +413,21 @@ toolbarbutton[part="scrollbutton-down"] {
}
#tabbrowser-tabs[positionpinnedtabs]>#tabbrowser-arrowscrollbox>.tabbrowser-tab[pinned] {
clip-path: inset(-4px -4px 0) !important;
clip-path: inset(-8px -8px 0) !important;
}
:root {
--uc-titlebar-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.2) inset;
--uc-titlebar-shadow: 0 -3px 2px -3px rgb(0 0 0 / .2) inset;
--uc-tab-shadow:
0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
0px 2px 4px rgba(0, 0, 0, 0.2), 0 4px 8px rgba(0, 0, 0, 0.1);
0px 2px 4px rgb(0 0 0 / .2), 0 4px 8px rgb(0 0 0 / .1);
}
:root[lwtheme-brighttext="true"] {
--uc-titlebar-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.75) inset inset;
--uc-titlebar-shadow: 0 -3px 2px -3px rgb(0 0 0 / .75) inset inset;
--uc-tab-shadow:
0 0 0 1px var(--lwt-tab-line-color, var(--lwt-tabs-border-color, transparent)),
0 2px 4px rgba(0, 0, 0, 0.45), 0 0px 2px rgba(0, 0, 0, 0.2);
0 2px 4px rgb(0 0 0 / .45), 0 0px 2px rgb(0 0 0 / .2);
}
#tabbrowser-tabs .tab-background:is([selected], [multiselected]),