mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2026-01-30 04:10:32 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into photon-style

Browse source
This commit is contained in:
alstjr7375 2023-08-05 10:36:13 +09:00
commit f29b9f89cc
23 changed files with 337 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.org
View file

@ -144,7 +144,8 @@ Windows users: Run with powershell ([[https://github.com/black7375/Firefox-UI-Fi
- Select ":package: Download ZIP"
2. Find your profile directory
- Open =about:support= in a new tab
- Find the =Profile Folder= entry and click the =Open Folder= button
- Find the =Profile Directory(Linux)= / =Profile Folder(Windows)= entry
- Click the =Open Directory(Linux)= / =Open Folder(Windows)= button
3. Copy downloaded files
- Extract the downloaded zip file
- Copy the =user.js= file to the previously opened profile directory

12
__tests__/accent_color.test.scss
View file

@ -7,6 +7,7 @@
@include output {
@include AccentColor {
body {
border-color: $accentBorder;
background-color: $accentColor;
color: $accentTextColor;
}
@ -14,11 +15,13 @@
}
@include expect {
body {
border-color: ActiveBorder;
background-color: AccentColor;
color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
body {
border-color: -moz-accent-color;
background-color: -moz-accent-color;
color: -moz-accent-color-foreground;
}
@ -32,10 +35,12 @@
:root {
@include AccentColor {
// Don't use like this!!
--uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
// Use like this
--uc-accent-border: #{$accentBorder};
--uc-accent-color: #{$accentColor};
--uc-accent-text-color: #{$accentTextColor};
}
@ -43,15 +48,19 @@
}
@include expect {
:root {
--uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
--uc-accent-border: ActiveBorder;
--uc-accent-color: AccentColor;
--uc-accent-text-color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
:root {
--uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
--uc-accent-border: -moz-accent-color;
--uc-accent-color: -moz-accent-color;
--uc-accent-text-color: -moz-accent-color-foreground;
}
@ -64,6 +73,7 @@
@include output {
@include AccentColor("Highlight") {
body {
border-color: $accentBorder;
background-color: $accentColor;
color: $accentTextColor;
}
@ -71,11 +81,13 @@
}
@include expect {
body {
border-color: ActiveBorder;
background-color: AccentColor;
color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
body {
border-color: -moz-accent-color;
background-color: Highlight;
color: HighlightText;
}

143
css/leptonChrome.css generated
View file

@ -423,6 +423,39 @@
}
}
}
/*= Windows - Classic Theme #734 =============================================*/
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8),
(-moz-os-version: windows-win10),
(-moz-platform: windows-win10) {
@media (-moz-windows-classic) {
:root[tabsintitlebar][sizemode="normal"]:not(:-moz-lwtheme) #navigator-toolbox {
appearance: auto !important;
-moz-default-appearance: -moz-window-titlebar !important;
}
:root[tabsintitlebar][sizemode="maximized"]:not(:-moz-lwtheme) #navigator-toolbox {
appearance: auto !important;
-moz-default-appearance: -moz-window-titlebar !important;
}
:root[tabsintitlebar]:not(:-moz-lwtheme) #tabbrowser-arrowscrollbox {
color: -moz-dialogtext !important;
}
:root[tabsintitlebar][sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
background-image: linear-gradient(
to bottom,
ThreeDLightShadow 0,
ThreeDLightShadow 1px,
ThreeDHighlight 1px,
ThreeDHighlight 2px,
ActiveBorder 2px,
ActiveBorder 4px,
transparent 4px
) !important;
}
}
}
}
/*= Others - Compatibility ===================================================*/
@supports -moz-bool-pref("userChrome.compatibility.panel_cutoff") {
@ -1329,8 +1362,8 @@
--menu-color: var(--arrowpanel-color, var(--in-content-page-color)) !important;
--menu-background-color: var(--arrowpanel-background, var(--in-content-button-background)) !important;
--menu-border-color: var(
--toolbarbutton-active-background,
var(--button-active-bgcolor, var(--card-outline-color))
--panel-separator-color,
var(--toolbarbutton-active-background, var(--button-active-bgcolor, var(--card-outline-color)))
) !important;
--menuitem-hover-background-color: var(
--toolbarbutton-hover-background,
@ -1351,8 +1384,9 @@
--panel-border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
border-top: 1px solid var(--menu-border-color) !important;
border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
@ -9593,11 +9627,14 @@
max-width: var(--uc-sidebar-width) !important;
will-change: min-width, max-width;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#sidebar-box:has(#sidebar-switcher-target.active) {
--uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
}
#sidebar-box:is(:hover, :focus-within) > #sidebar-header,
#sidebar-box:is(:hover, :focus-within) > #sidebar {
#sidebar-box:is(:hover, :focus-within) > #sidebar,
#sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
#sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@ -9623,14 +9660,17 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
var(--uc-autohide-sidebar-delay) !important;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#siebar-box:has(#sidebar-switcher-target.active) {
transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function),
opacity var(--uc-autohide-sidebar-speed) ease-in-out,
box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed),
visibility 0s linear !important;
}
#sidebar-box:is(:hover, :focus-within) > #sidebar-header,
#sidebar-box:is(:hover, :focus-within) > #sidebar {
#sidebar-box:is(:hover, :focus-within) > #sidebar,
#siebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
#siebar-box:has(#sidebar-switcher-target.active) > #sidebar {
transition-delay: 0ms !important;
}
:root[inFullscreen="true"] #sidebar-box {
@ -9640,7 +9680,8 @@
box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
visibility 0s linear !important;
}
:root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
:root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
:root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@ -9653,7 +9694,8 @@
overflow: hidden;
will-change: min-width, max-width;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#sidebar-box:has(#sidebar-switcher-target.active) {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@ -9677,7 +9719,8 @@
var(--uc-autohide-sidebar-delay),
max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
:root[inFullscreen="true"] #sidebar-box {
@ -9687,7 +9730,8 @@
:root[inFullscreen="true"] #sidebar-box[positionend="true"] {
transition-property: margin-inline-end !important;
}
:root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
:root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
:root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@ -10585,24 +10629,42 @@
list-style-image: url("../icons/broom.svg");
}
/*= sidebarMenu-popup ========================================================*/
#identity-popup-more-info {
#identity-popup-more-info.subviewbutton {
list-style-image: url("chrome://global/skin/icons/info.svg");
}
#sidebar-switcher-bookmarks {
#identity-popup-more-info:is(menuitem) {
--menuitem-image: url("chrome://global/skin/icons/info.svg");
}
#sidebar-switcher-bookmarks.subviewbutton {
list-style-image: url("chrome://browser/skin/bookmark.svg");
}
#sidebar-switcher-history {
#sidebar-switcher-bookmarks:is(menuitem) {
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
#sidebar-switcher-history.subviewbutton {
list-style-image: url("chrome://browser/skin/history.svg");
}
#sidebar-switcher-tabs {
#sidebar-switcher-history:is(menuitem) {
--menuitem-image: url("chrome://browser/skin/history.svg");
}
#sidebar-switcher-tabs.subviewbutton {
list-style-image: url("../icons/synced-tabs.svg");
}
#sidebar-reverse-position {
#sidebar-switcher-tabs:is(menuitem) {
--menuitem-image: url("../icons/synced-tabs.svg");
}
#sidebar-reverse-position.subviewbutton {
list-style-image: var(--uc-sidebar-icon-reverse);
}
#sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
#sidebar-reverse-position:is(menuitem) {
--menuitem-image: var(--uc-sidebar-icon-reverse);
}
#sidebarMenu-popup > *.subviewbutton[data-l10n-id="sidebar-menu-close"] {
list-style-image: url("chrome://global/skin/icons/close.svg");
}
#sidebarMenu-popup > *:is(menuitem)[data-l10n-id="sidebar-menu-close"] {
--menuitem-image: url("chrome://global/skin/icons/close.svg");
}
/*= unified-extensions-view ===================================================*/
#unified-extensions-manage-extensions {
list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
@ -10649,6 +10711,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
/* Color */
-moz-context-properties: fill, fill-opacity, stroke !important;
@ -10706,10 +10769,21 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
padding-inline-start: var(--context-menu-background-padding) !important;
}
#sidebarMenu-popup:has(menuitem) {
margin-inline-start: calc(
(var(--context-menu-background-padding) + var(--panel-shadow-margin, 4px)) * -1
) !important;
}
:not(menu, #ContentSelectDropdown, #context-navigation)
> #sidebarMenu-popup:has(menuitem)
> menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
padding-inline-start: 28px !important;
}
/* Menubar */
@supports -moz-bool-pref("userChrome.icon.global_menubar") {
#main-menubar > menu {
@ -10861,6 +10935,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
background-position: left var(--context-menu-background-padding) center !important;
padding-inline-start: 0 !important;
@ -10886,6 +10961,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
#sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
padding-inline-start: var(--menu-background-padding-default) !important;
margin-left: 0 !important;
@ -11616,7 +11692,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */
@ -11769,7 +11845,7 @@
.pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/settings.svg");
}
.pageActionContextMenuItem.extensionPinned.extensionUnpinned .removeExtensionItem {
.pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
/*= customizationPanelItemContextMenu ========================================*/
@ -11946,6 +12022,13 @@
.unified-extensions-context-menu-report-extension {
--menuitem-image: url("../icons/send.svg");
}
/*= urlbarView-result-menu ===================================================*/
.urlbarView-result-menuitem[data-command="dismiss"] {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
.urlbarView-result-menuitem[data-command="help"] {
--menuitem-image: url("chrome://global/skin/icons/info.svg");
}
}
@supports -moz-bool-pref("userChrome.icon.global_menubar") {
/*= main-menubar =============================================================*/
@ -11987,7 +12070,7 @@
--menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
}
#menu_openFile {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#menu_savePage {
--menuitem-image: url("../icons/toolbarButton-download.svg");
@ -12125,6 +12208,9 @@
#hiddenTabsMenu {
--menuitem-image: url("../icons/eye-hide.svg");
}
#menu_searchHistory {
--menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
}
#historyUndoMenu {
--menuitem-image: url("chrome://browser/skin/tab.svg");
}
@ -12149,6 +12235,9 @@
#menu_bookmarkThisPage[data-l10n-id="menu-bookmark-edit"] {
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
#menu_searchBookmarks {
--menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
}
/*= menu_ToolsPopup ==========================================================*/
#menu_openDownloads {
--menuitem-image: url("chrome://browser/skin/downloads/downloads.svg");
@ -12261,6 +12350,11 @@
#orgUndo {
--menuitem-image: url("../icons/undo.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#orgRedo {
--menuitem-image: url("../icons/redo.svg");
}
}
#orgCut {
--menuitem-image: url("chrome://browser/skin/edit-cut.svg");
}
@ -12288,13 +12382,18 @@
}
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
--menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
--menuitem-image: url("../icons/datastore.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#fileRestoreMenu {
--menuitem-image: url("../icons/datarestore.svg");
}
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {
--menuitem-image: url("chrome://browser/skin/import.svg");

38
css/leptonContent.css generated
View file

@ -1696,6 +1696,12 @@
/** Fully Proton Mode *********************************************************/
@supports -moz-bool-pref("userContent.page.proton") {
/*= Common contents ==========================================================*/ /*= abouts' common ===========================================================*/
@-moz-document url-prefix("about:"), url-prefix("chrome://pippki/content/"), url-prefix("chrome://browser/content/")
{
xul|treecols {
border-bottom-color: var(--in-content-box-border-color) !important;
}
}
@-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard"), url-prefix("about:sync-log"), url-prefix("about:memory"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
{
/* Base */
@ -2059,6 +2065,22 @@
height: 48px;
}
}
@-moz-document url-prefix("about:preferences") {
#handlersView > richlistitem:hover,
#translations-manage-install-list > .translations-manage-language:hover {
background-color: var(--in-content-item-hover);
color: var(--in-content-item-hover-text);
}
#handlersView > richlistitem[selected="true"],
#translations-manage-install-list > .translations-manage-language[selected="true"] {
background-color: var(--in-content-item-selected);
color: var(--in-content-item-selected-text);
}
#handlersView > richlistitem:nth-child(even):not([selected="true"], :hover),
#translations-manage-install-list > .translations-manage-language:nth-child(even):not([selected="true"], :hover) {
background-color: var(--in-content-box-background-odd);
}
}
/*= chrome://browser/content/places/places.xhtml =============================*/
@-moz-document url("chrome://browser/content/places/places.xhtml")
{
@ -3276,7 +3298,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */
@ -3412,6 +3434,11 @@
#orgUndo {
--menuitem-image: url("../icons/undo.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#orgRedo {
--menuitem-image: url("../icons/redo.svg");
}
}
#orgCut {
--menuitem-image: url("chrome://browser/skin/edit-cut.svg");
}
@ -3439,13 +3466,18 @@
}
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
--menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
--menuitem-image: url("../icons/datastore.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#fileRestoreMenu {
--menuitem-image: url("../icons/datarestore.svg");
}
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {
--menuitem-image: url("chrome://browser/skin/import.svg");

6
icons/datarestore.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
<path d="M4.438 0a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h3.091a6 6 0 0 1-.62-1.213H4.437c-.553 0-1.788-1.235-1.788-1.787V3c0-.552 1.235-1.787 1.788-1.787h7.125c.552 0 1.787 1.235 1.787 1.787v3.742a6 6 0 0 1 1.213.303V3a3 3 0 0 0-3-3H4.436z"/>
<path d="M2.6 7v1h6.173a6 6 0 0 1 1.842-1H2.6z"/>
<rect width="4.8" height="1" x="5.6" y="4" rx=".6"/>
<path d="M6.2 10c-.333 0-.6.223-.6.5s.267.5.6.5h.554a6 6 0 0 1 .39-1H6.2zm5.898-1.177c-1.423.007-2.729.726-3.408 1.88V9.496c0-.3-.487-.3-.487 0v2.245c0 .124.11.224.243.224h2.435a.225.225 0 0 0 0-.449H9.344a.413.413 0 0 0 .027-.038c1.137-2.817 5.66-2.062 5.66.94 0 3-4.523 3.756-5.66.94-.235-.545-1.12-.24-.912.313 1.104 2.711 5.056 3.162 6.843.781 1.786-2.38-.064-5.633-3.204-5.63z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 878 B

6
icons/datastore.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
<path d="M4.437 0h7.126a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H4.437a3 3 0 0 1-3-3V3a3 3 0 0 1 3-3zm0 1.213C3.885 1.213 2.65 2.448 2.65 3v10c0 .552 1.235 1.787 1.787 1.787h7.126c.552 0 1.787-1.235 1.787-1.787V3c0-.552-1.235-1.787-1.787-1.787z"/>
<path d="M2.6 7h10.8v1H2.6Z"/>
<rect width="4.8" height="1" x="5.6" y="4" rx=".6"/>
<rect width="4.8" height="1" x="5.6" y="10" rx=".6"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 531 B

4
icons/toolbarButton-upload.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
<path d="M9.709 6.078h-1.84a.477.477 0 0 1-.337-.813l2.555-2.554a.477.477 0 0 1 .673 0l2.554 2.554c.3.3.088.813-.337.813h-1.84v2.796h.002v1.19h-.002v.786H9.71v-.785h-.003v-1.19h.004V6.078z"/>
<path d="M13.714 3.357h-.98l1.08 1.19h.067c.329 0 .429.267.429.596v7.619a.595.595 0 0 1-.596.595H2.286a.595.595 0 0 1-.596-.595V3.238c0-.328.267-.595.596-.595h3.47a.6.6 0 0 1 .442.197l.941 1.091c.112.126.211.138.38.138l.382-.35.347-.423-.576-.532-.59-.722a1.79 1.79 0 0 0-1.328-.59H2.286C1.3 1.452.5 2.252.5 3.237v9.524c0 .985.801 1.786 1.786 1.786h11.428c.985 0 1.786-.801 1.786-1.786v-7.62c0-.984-.801-1.785-1.786-1.785z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 769 B

9
src/autohide/sidebar/_overlap.scss
View file

@ -6,7 +6,8 @@
will-change: min-width, max-width;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#sidebar-box:has(#sidebar-switcher-target.active) {
--uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
> {
@ -46,7 +47,8 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
}
#sidebar-box:is(:hover, :focus-within) {
#sidebar-box:is(:hover, :focus-within),
#siebar-box:has(#sidebar-switcher-target.active) {
transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function), opacity var(--uc-autohide-sidebar-speed) ease-in-out,
box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed), visibility 0s linear !important;
> {
@ -63,7 +65,8 @@
box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
visibility 0s linear !important;
&:is(:hover, :focus-within) {
&:is(:hover, :focus-within),
&:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}

9
src/autohide/sidebar/_static.scss
View file

@ -3,7 +3,8 @@
overflow: hidden;
will-change: min-width, max-width;
&:is(:hover, :focus-within) {
&:is(:hover, :focus-within),
&:has(#sidebar-switcher-target.active) {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@ -35,7 +36,8 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay),
max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
&:is(:hover, :focus-within) {
&:is(:hover, :focus-within),
&:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@ -46,7 +48,8 @@
&[positionend="true"] {
transition-property: margin-inline-end !important;
}
&:is(:hover, :focus-within) {
&:is(:hover, :focus-within),
&:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}

32
src/compatibility/_os.scss
View file

@ -240,3 +240,35 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5);
}
}
}
/*= Windows - Classic Theme #734 =============================================*/
// It occurs by #titlebar { appearance: none !important; } above
// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser.css#L96-L109
// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser.css#L164-L174
// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser-aero.css#L71-L81
@include OS($win) {
@media (-moz-windows-classic) {
:root[tabsintitlebar][sizemode="normal"]:not(:-moz-lwtheme) #navigator-toolbox {
appearance: auto !important;
-moz-default-appearance: -moz-window-titlebar !important;;
}
:root[tabsintitlebar][sizemode="maximized"]:not(:-moz-lwtheme) #navigator-toolbox {
appearance: auto !important;;
-moz-default-appearance:-moz-window-titlebar !important;;
}
:root[tabsintitlebar]:not(:-moz-lwtheme) #tabbrowser-arrowscrollbox {
color: -moz-dialogtext !important;
}
:root[tabsintitlebar][sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
background-image: linear-gradient(
to bottom,
ThreeDLightShadow 0, ThreeDLightShadow 1px,
ThreeDHighlight 1px, ThreeDHighlight 2px,
ActiveBorder 2px, ActiveBorder 4px, transparent 4px
) !important;
}
}
}

18
src/contents/proton_contents/_about_preferences.scss
View file

@ -1,3 +1,21 @@
@include moz-document(url-prefix "chrome://browser/content") {
@import "../../theme/proton_chrome/sanitize_everything";
}
@include moz-document(url-prefix "about:preferences") {
// Odd table #737
#handlersView > richlistitem,
#translations-manage-install-list > .translations-manage-language {
&:hover {
background-color: var(--in-content-item-hover);
color: var(--in-content-item-hover-text);
}
&[selected="true"] {
background-color: var(--in-content-item-selected);
color: var(--in-content-item-selected-text);
}
&:nth-child(even):not([selected="true"], :hover) {
background-color: var(--in-content-box-background-odd);
}
}
}

13
src/contents/proton_contents/_proton_commons.scss
View file

@ -1,4 +1,17 @@
/*= abouts' common ===========================================================*/
@include moz-document(
url-prefix "about:",
url-prefix "chrome://pippki/content/",
url-prefix "chrome://browser/content/"
) {
// The first row separator line #736
xul|treecols {
// border-bottom: 1px solid var(--in-content-border-color);
border-bottom-color: var(--in-content-box-border-color) !important;
}
}
@include moz-document(
url-prefix "about:plugins",
url-prefix "about:cache",

9
src/icons/_global_menu.scss
View file

@ -19,7 +19,7 @@
#menu_openLocation {
}
#menu_openFile {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#menu_close {
}
@ -189,6 +189,9 @@ menu.share-tab-url-item {
#hiddenTabsMenu {
--menuitem-image: url("../icons/eye-hide.svg")
}
#menu_searchHistory {
--menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
}
#historyUndoMenu {
--menuitem-image: url("chrome://browser/skin/tab.svg");
}
@ -217,6 +220,10 @@ menu.share-tab-url-item {
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
#menu_searchBookmarks {
--menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
}
#bookmarksToolbarFolderMenu {
}
#menu_unsortedBookmarks {

10
src/icons/_library.scss
View file

@ -16,6 +16,9 @@
--menuitem-image: url("../icons/undo.svg");
}
#orgRedo {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/redo.svg");
}
}
#orgCut {
@ -49,16 +52,19 @@
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
--menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
--menuitem-image: url("../icons/datastore.svg");
}
#fileRestoreMenu {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/datarestore.svg");
}
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {

26
src/icons/_panel.scss
View file

@ -469,28 +469,40 @@ panelMenuBookmarkThisPage[starred] {
}
/*= sidebarMenu-popup ========================================================*/
@mixin _subviewMenuitem($icon, $selector: null) {
&.subviewbutton#{$selector} {
list-style-image: $icon;
}
&:is(menuitem)#{$selector} {
--menuitem-image: #{$icon};
}
}
#identity-popup-more-info {
list-style-image: url("chrome://global/skin/icons/info.svg");
@include _subviewMenuitem(url("chrome://global/skin/icons/info.svg"));
}
#sidebar-switcher-bookmarks {
list-style-image: url("chrome://browser/skin/bookmark.svg");
@include _subviewMenuitem(url("chrome://browser/skin/bookmark.svg"));
}
#sidebar-switcher-history {
list-style-image: url("chrome://browser/skin/history.svg");
@include _subviewMenuitem(url("chrome://browser/skin/history.svg"));
}
#sidebar-switcher-tabs {
list-style-image: url("../icons/synced-tabs.svg");
@include _subviewMenuitem(url("../icons/synced-tabs.svg"));
}
#sidebar-reverse-position {
list-style-image: var(--uc-sidebar-icon-reverse);
@include _subviewMenuitem(var(--uc-sidebar-icon-reverse));
}
#sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
list-style-image: url("chrome://global/skin/icons/close.svg");
#sidebarMenu-popup > * {
@include _subviewMenuitem(
url("chrome://global/skin/icons/close.svg"),
"[data-l10n-id=\"sidebar-menu-close\"]"
);
}
/*= unified-extensions-view ===================================================*/

2
src/icons/context_menu/_downloads.scss
View file

@ -9,7 +9,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
--menuitem-image: url("chrome://browser/skin/open.svg");
--menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */

12
src/icons/context_menu/_others.scss
View file

@ -42,7 +42,7 @@
&.manageExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/settings.svg");
}
.removeExtensionItem {
&.removeExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
}
@ -240,3 +240,13 @@ menuitem.searchbar-clear-history {
.unified-extensions-context-menu-report-extension {
--menuitem-image: url("../icons/send.svg");
}
/*= urlbarView-result-menu ===================================================*/
.urlbarView-result-menuitem {
&[data-command="dismiss"] {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
&[data-command="help"] {
--menuitem-image: url("chrome://global/skin/icons/info.svg");
}
}

6
src/icons/layout/_menu.scss
View file

@ -57,6 +57,12 @@ $_layoutCommonMenus: (
@include _layoutInitPaddingMenus {
@include _layout_init_padding;
}
#sidebarMenu-popup:has(menuitem) {
@include _layout_init_margin;
:not(menu, #ContentSelectDropdown, #context-navigation) > & > #{$_iconMenuitem} {
padding-inline-start: 28px !important;
}
}
/* Menubar */
@include Option("userChrome.icon.global_menubar") {

6
src/icons/layout/_menu_common.scss
View file

@ -31,7 +31,7 @@ $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
$_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}";
$_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup";
$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup) > menuitem";
$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar";
$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, #sidebarMenu-popup";
//-- Mixin ---------------------------------------------------------------------
// Init Menu
@ -79,6 +79,10 @@ $_initialMenus: $_initialMenus + "," +
background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
padding-inline-start: var(--context-menu-background-padding) !important;
}
@mixin _layout_init_margin() {
// Fix sidebar position
margin-inline-start: calc((var(--context-menu-background-padding) + var(--panel-shadow-margin, 4px)) * -1) !important
}
@mixin _layout_win_native_menu_popup() {
@include NativeMenuPopup {

11
src/theme/_fully_color.scss
View file

@ -5,9 +5,10 @@ html#main-window menupopup:not(.in-menulist) {
--menu-background-color: var(--arrowpanel-background, var(--in-content-button-background)) !important;
--menu-border-color: var(
--toolbarbutton-active-background,
var(--button-active-bgcolor, var(--card-outline-color))
) !important;
--panel-separator-color,
var(--toolbarbutton-active-background,
var(--button-active-bgcolor, var(--card-outline-color))
)) !important;
--menuitem-hover-background-color: var(
--toolbarbutton-hover-background,
var(--button-hover-bgcolor, var(--in-content-button-background-hover))
@ -30,9 +31,11 @@ html#main-window menupopup:not(.in-menulist) {
--panel-border-color: var(--menu-border-color) !important;
&:not([placespopup]) menuseparator,
&:not([placespopup]) menuseparator::before,
&[placespopup] menuseparator::before {
// #732
// toolbarbutton menupopup[placespopup] menuseparator::before
border-top: 1px solid var(--menu-border-color) !important;
border-color: var(--menu-border-color) !important;
}
menu,

2
src/theme/system_default_theme/_win10.scss
View file

@ -320,7 +320,7 @@
.titlebar-color {
@include AccentColor {
color: $accentTextColor;
background-color: $accentColor;
background-color: $accentColor; // TODO: Use $accentBorder
}
}

4
src/utils/_accent_color.scss
View file

@ -4,6 +4,7 @@
// https://github.com/mozilla/gecko-dev/commit/4c5f20179e8d3b963dc588efb9dc2c7b49e7bb31
//
// Need to hard coded #437
$accentBorder: ActiveBorder;
$accentColor: AccentColor;
$accentTextColor: AccentColorText;
@ -11,6 +12,8 @@ $accentTextColor: AccentColorText;
@content;
@include Option("userChrome.compatibility.accent_color") {
$accentBorder: -moz-accent-color !global;
@if $mode == "Highlight" {
$accentColor: Highlight !global;
$accentTextColor: HighlightText !global;
@ -22,6 +25,7 @@ $accentTextColor: AccentColorText;
@content;
}
$accentBorder: ActiveBorder !global;
$accentColor: AccentColor !global;
$accentTextColor: AccentColorText !global;
}

12
yarn.lock
View file

@ -2115,14 +2115,14 @@ sass@^1.56.1:
source-map-js ">=0.6.2 <2.0.0"
semver@^6.0.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.3.5:
version "7.3.8"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"