Merge branch 'master' into dev

This commit is contained in:
alstjr7375 2022-10-17 13:36:15 +09:00
commit c63e0b3346
22 changed files with 317 additions and 26 deletions

View file

@ -395,6 +395,14 @@
/* -moz-default-appearance: -moz-window-titlebar */
appearance: none !important;
}
@media (-moz-os-version: windows-win7),
(-moz-platform: windows-win7),
(-moz-os-version: windows-win8),
(-moz-platform: windows-win8) {
:root[tabsintitlebar][sizemode="maximized"] #titlebar {
padding-top: 8px;
}
}
}
@supports -moz-bool-pref("userChrome.compatibility.os.windows_maximized") {
:root[tabsintitlebar][sizemode="maximized"] #titlebar {
@ -3640,7 +3648,25 @@
}
}
}
:root {
/* Works with TabMixPlus */
--tab-min-height_mlt: calc(
var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px)))
) !important;
}
#TabsToolbar[multibar] .tabbrowser-tab {
height: unset !important;
/* Original: var(--tab-min-height_mlt) */
}
@supports -moz-bool-pref("userChrome.tab.connect_to_window") {
:root {
--tab-min-height_mlt: calc(
var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px))
) !important;
}
#TabsToolbar {
--toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important;
/* Prevent overflow pinned tab bottom margin */
@ -3666,12 +3692,6 @@
}
}
}
/* Works with TabMixPlus */
#TabsToolbar[multibar] .tabbrowser-tab {
height: unset !important;
/* Original: var(--tab-min-height_mlt) */
}
/* Scroll Button - Size Fix */
:root #tabbrowser-arrowscrollbox {
--scrollbtn-vertical-padding: 3px;
@ -7732,8 +7752,16 @@
overflow: hidden;
}
#sidebar-header {
font-size: unset !important;
}
#sidebar-header > #sidebar-switcher-target {
font-size: 1.333em;
}
@supports not -moz-bool-pref("userChrome.autohide.sidebar") {
#sidebar-box,
#sidebar-header,
#sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
@ -7744,7 +7772,7 @@
will-change: padding-inline;
}
#sidebar-box:not([hidden="true"]) {
padding-inline-start: var(--uc-sidebar-activate-width);
padding-inline-start: var(--uc-sidebar-activate-width) !important;
}
@media (prefers-reduced-motion: no-preference) {
#sidebar-box {
@ -8841,12 +8869,14 @@
}
@supports -moz-bool-pref("userChrome.sidebar.overlap") {
#sidebar-header,
#sidebar {
min-width: var(--uc-sidebar-width) !important;
max-width: var(--uc-sidebar-width) !important;
will-change: min-width, max-width;
}
#sidebar-box:is(:hover, :focus-within) > #sidebar-header,
#sidebar-box:is(:hover, :focus-within) > #sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
@ -8868,11 +8898,13 @@
}
@media (prefers-reduced-motion: no-preference) {
#sidebar-header,
#sidebar {
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-header,
#sidebar-box:is(:hover, :focus-within) > #sidebar {
transition-delay: 0ms !important;
}
@ -9959,6 +9991,11 @@
background-image: var(--menuitem-image);
}
#tabContextMenu > .tabmix-newtab-menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
}
/* For native context menus */
@supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
:not(menu, #ContentSelectDropdown)
@ -10308,7 +10345,11 @@
#treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
#tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
#sidebartabs_asamuzak_jp-menuitem-_dupeTab {
--menuitem-image: url("../icons/notebook-subsection.svg");
--menuitem-image: url("../icons/tab-copy.svg");
}
#tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
--menuitem-image: url("../icons/tab-unload.svg");
}
#context_bookmarkTab,
@ -10368,6 +10409,15 @@
--menuitem-image: url("chrome://global/skin/icons/close.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#context_closeTabOptions,
#treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs,
#tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs,
#sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs {
--menuitem-image: url("../icons/filter-dismiss.svg");
}
}
#context_undoCloseTab,
#treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab,
#treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_undoCloseTab,
@ -10463,6 +10513,45 @@
--menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
}
/*= Tab Mix Plus =============================================================*/
#context_openANewTab.tabmix-newtab-menu-icon {
list-style-image: var(--menuitem-image) !important;
}
#tm-copyTabUrl {
--menuitem-image: url("../icons/link.svg");
}
#context_reloadTabOptions {
--menuitem-image: url("../icons/reload.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#context_reloadTabOptions {
--menuitem-image: url("../icons/filter-reload.svg");
}
}
@supports not -moz-bool-pref("userChrome.icon.menu.full") {
#context_reloadTabOptions + #context_reloadTab {
--menuitem-image: url("../icons/blank.svg");
}
}
#tm-protectTab {
--menuitem-image: url("../icons/shield-task.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#tm-lockTab {
--menuitem-image: url("../icons/lock-closed.svg");
}
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#context_bookmarkAllTabs {
--menuitem-image: url("../icons/bookmark-multiple.svg");
}
}
/*= contentAreaContextMenu ===================================================*/
#context-viewsource-goToLine {
--menuitem-image: url("../icons/text-number-format.svg");
@ -10782,6 +10871,19 @@
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
}
/*= Tab Mix Plus =============================================================*/
#tm-autoreload_menu {
--menuitem-image: url("../icons/reload-auto.svg");
}
#tm-openAllLinks {
--menuitem-image: url("../icons/new-tab-multiple.svg");
}
#tm-content-undoCloseTab {
--menuitem-image: url("../icons/undo.svg");
}
/*= downloadsContextMenu =====================================================*/
.downloadPauseMenuItem {
--menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
@ -11096,6 +11198,12 @@
--menuitem-image: url("chrome://browser/skin/edit-paste.svg");
}
@supports -moz-bool-pref("userChrome.icon.menu.full") {
#paste-and-go {
--menuitem-image: url("../icons/edit-paste-go.svg");
}
}
#urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
@ -11137,6 +11245,12 @@
}
/* Only searchbar */
@supports -moz-bool-pref("userChrome.icon.menu.full") {
menuitem.searchbar-paste-and-search {
--menuitem-image: url("../icons/edit-paste-search.svg");
}
}
menuitem.searchbar-clear-history {
--menuitem-image: url("chrome://browser/skin/forget.svg");
}
@ -11431,6 +11545,10 @@
--menuitem-image: url("chrome://browser/skin/sync.svg");
}
#menu_openFirefoxView {
--menuitem-image: url("chrome://branding/content/icon32.png");
}
#webDeveloperMenu,
#browserToolsMenu {
--menuitem-image: url("../icons/developer.svg");

View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M9.037 0c-.599 0-1.13.358-1.351.914l-.395.994a1.457 1.457 0 0 1 1.156.117l.276-.697a.326.326 0 0 1 .314-.213.328.328 0 0 1 .313.213l1.28 3.215.483.352 3.453.222a.328.328 0 0 1 .301.235.325.325 0 0 1-.105.365l-.576.476a1.446 1.446 0 0 1 .441.653 1.446 1.446 0 0 1 .07.373l.776-.645a1.446 1.446 0 0 0 .455-1.568 1.446 1.446 0 0 0-1.29-1l-3.1-.201-1.151-2.89A1.445 1.445 0 0 0 9.037 0zM6.963 2.613c-.599 0-1.13.36-1.352.916L4.463 6.418l-3.102.201a1.447 1.447 0 0 0-1.289 1 1.444 1.444 0 0 0 .453 1.567l2.393 1.986-.768 3.012a1.446 1.446 0 0 0 .555 1.535c.255.186.554.279.854.279a1.455 1.455 0 0 0 .777-.225l2.627-1.662 2.627 1.662a1.444 1.444 0 0 0 1.63-.052 1.446 1.446 0 0 0 .555-1.535l-.767-3.012 2.39-1.986a1.446 1.446 0 0 0 .456-1.569 1.446 1.446 0 0 0-1.29-1l-3.101-.201-1.149-2.889a1.45 1.45 0 0 0-1.351-.916zm0 1.116a.328.328 0 0 1 .314.212L8.56 7.156l.482.352 3.453.222a.328.328 0 0 1 .299.235.325.325 0 0 1-.105.363l-2.665 2.211-.183.566.855 3.356a.328.328 0 0 1-.127.355.326.326 0 0 1-.38.014l-2.926-1.85h-.596L3.74 14.83a.324.324 0 0 1-.38-.014.325.325 0 0 1-.13-.355l.856-3.354-.184-.566-2.664-2.213a.325.325 0 0 1-.105-.363.327.327 0 0 1 .299-.233l3.455-.224.482-.35 1.28-3.217a.326.326 0 0 1 .314-.212z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

4
icons/edit-paste-go.svg Normal file
View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M7.432 0a2.5 2.5 0 0 0-2.38 2H3.999a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h3.9l3.33-3.172H5.437c-1.44-.002-1.766-2.065-.98-3.004A.995.995 0 0 1 4 9V5h5.537c.621-.353 1.442-.377 2.133.26L13 6.527V4a2 2 0 0 0-2-2H9.95a2.5 2.5 0 0 0-2.518-2zm.125 1a1.5 1.5 0 0 1 1.412 1.2 1 1 0 0 0 .98.8H11v1H4V3h1.05a1 1 0 0 0 .98-.8A1.5 1.5 0 0 1 7.556 1zM7.5 2c-.785 0 .5 1.285.5.5a.5.5 0 0 0-.5-.5zm-2 4c-.667 0-.667 1 0 1h3.18a1.488 1.488 0 0 1 0-1H5.5zm0 2c-.667 0-.667 1 0 1h2c.667 0 .667-1 0-1h-2z"/>
<path d="m15.798 10.678-4.136-4.137a.69.69 0 0 0-.975.975l2.96 2.96H5.658a.69.69 0 0 0 0 1.379h7.987l-2.96 2.96a.69.69 0 1 0 .976.975l4.136-4.137a.69.69 0 0 0 0-.975z"/>
</svg>

After

Width:  |  Height:  |  Size: 813 B

View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M7.455-.002a2.5 2.5 0 0 0-.266.02A2.5 2.5 0 0 0 5.051 2H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h7a2 2 0 0 0 1.844-1.236l-1.623-1.616a5.17 5.17 0 0 1-2.666.752 5.17 5.17 0 0 1-5.17-5.17A5.17 5.17 0 0 1 4 6.31V5h.992a5.17 5.17 0 0 1 1.485-1H4V3h1.05a1 1 0 0 0 .98-.8 1.5 1.5 0 0 1 2.939 0 1 1 0 0 0 .98.8H11v1h-.36A5.17 5.17 0 0 1 13 6.09V4a2 2 0 0 0-2-2H9.95A2.5 2.5 0 0 0 7.454-.002zM7.5 2a.5.5 0 1 0 .5.5.5.5 0 0 0-.5-.5z"/>
<path d="m15.68 14.706-3.539-3.538a4.417 4.417 0 1 0-1.037 1.037l3.538 3.539a.734.734 0 0 0 1.038-1.038zm-7.123-3.15a2.935 2.935 0 1 1 2.935-2.935 2.935 2.935 0 0 1-2.935 2.935Z" style="stroke-width:.733799"/>
</svg>

After

Width:  |  Height:  |  Size: 789 B

3
icons/filter-dismiss.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M15.94 6.144a4.537 4.537 0 1 1-9.074 0 4.537 4.537 0 0 1 9.074 0zm-5.895-1.942a.413.413 0 0 0-.584.584l1.359 1.358-1.36 1.358a.413.413 0 0 0 .584.583l1.358-1.358 1.358 1.358a.413.413 0 0 0 .583-.583l-1.358-1.358 1.358-1.358a.413.413 0 0 0-.583-.584l-1.358 1.359zm-2.069 6.067A5.392 5.392 0 0 1 6.884 9.03h-3.73a.619.619 0 0 0 0 1.238zM6.04 6.144c0-.426.05-.84.144-1.238H.68a.619.619 0 0 0 0 1.238zm2.063 7.012a.619.619 0 0 1 0 1.237H5.628a.619.619 0 0 1 0-1.237z"/>
</svg>

After

Width:  |  Height:  |  Size: 624 B

3
icons/filter-reload.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M10.985 1.627a4.537 4.537 0 0 0-4.12 4.518 4.537 4.537 0 1 0 9.075 0 4.537 4.537 0 0 0-4.955-4.518zm.377 1.76a2.727 2.727 0 0 1 1.84.71l.572-.572a.196.196 0 0 1 .334.14V5.23l-.117.118h-1.567a.196.196 0 0 1-.138-.336l.568-.569a2.24 2.24 0 0 0-1.492-.566 2.258 2.258 0 0 0-2.256 2.256 2.258 2.258 0 0 0 2.256 2.256 2.247 2.247 0 0 0 2.246-2.037.25.25 0 0 1 .268-.221.246.246 0 0 1 .22.267 2.735 2.735 0 0 1-2.734 2.48 2.75 2.75 0 0 1-2.746-2.745 2.75 2.75 0 0 1 2.746-2.746zM.68 4.907a.62.62 0 0 0 0 1.238h5.36c0-.426.05-.84.144-1.239H.68zm2.475 4.122a.62.62 0 0 0 0 1.239l4.82.002a5.392 5.392 0 0 1-1.092-1.24H3.155zm2.472 4.127a.619.619 0 0 0 0 1.237h2.475a.619.619 0 0 0 0-1.237H5.627z"/>
</svg>

After

Width:  |  Height:  |  Size: 848 B

3
icons/lock-closed.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M8 0a3.2 3.2 0 0 1 3.2 3.2v1.6h1.4a1.8 1.8 0 0 1 1.8 1.8v7.6a1.8 1.8 0 0 1-1.8 1.8H3.4a1.8 1.8 0 0 1-1.8-1.8V6.6a1.8 1.8 0 0 1 1.8-1.8h1.4V3.2A3.2 3.2 0 0 1 8 0Zm4.6 6H3.4a.6.6 0 0 0-.6.6v7.6a.6.6 0 0 0 .6.6h9.2a.6.6 0 0 0 .6-.6V6.6a.6.6 0 0 0-.6-.6ZM8 9.2a1.2 1.2 0 1 1 0 2.4 1.2 1.2 0 0 1 0-2.4zm0-8a2 2 0 0 0-2 2v1.6h4V3.2a2 2 0 0 0-2-2Z"/>
</svg>

After

Width:  |  Height:  |  Size: 502 B

View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M4.04 4.69a2 2 0 0 0-2 2v4.585h-1c-1.334 0-1.334 1.485 0 1.485h7v-.485a1 1 0 0 1 .872-.99h-5.64V8.838h.01v-1.98a1.11 1.11 0 0 1 1.113-1.114h7.035a1.11 1.11 0 0 1 1.113 1.113v1.418h.496a1 1 0 0 1 1 1V6.69a2 2 0 0 0-2-2h-8zm8.5 4.585c-.25 0-.5.167-.5.5v2.5h-2.5c-.668 0-.668 1 0 1h2.5v2.5c0 .667 1 .667 1 0v-2.5h2.5c.666 0 .666-1 0-1h-2.5v-2.5c0-.333-.25-.5-.5-.5z"/>
<path d="M12.5 2.721a3.5 3.5 0 0 1 3.5 3.5v2.5c0 .819-.393 1.545-1 2v-4.5a2.5 2.5 0 0 0-2.5-2.5H3c.456-.606 1.182-1 2-1z"/>
</svg>

After

Width:  |  Height:  |  Size: 650 B

View file

@ -1,4 +0,0 @@
<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="M12.5 3A3.5 3.5 0 0 1 16 6.5V9c0 .818-.393 1.544-1 2V6.5A2.5 2.5 0 0 0 12.5 4H3c.456-.607 1.182-1 2-1h7.5Z"/>
<path d="M15.995 12.432 16 12.5c0 .253-.226.462-.519.495L15.4 13H.6c-.331 0-.6-.224-.6-.5 0-.253.226-.462.519-.495L.6 12H1V7a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v5h1.4c.304 0 .555.188.595.432ZM13 7a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v5h11V7Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 501 B

4
icons/reload-auto.svg Normal file
View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M8.366 0a.475.475 0 0 0-.474.48v1.967l-.016.105v.09c-3.62.074-6.543 3.04-6.543 6.677a6.689 6.689 0 0 0 6.68 6.68 6.652 6.652 0 0 0 6.652-6.033.599.599 0 0 0-.538-.651.604.604 0 0 0-.65.536 5.466 5.466 0 0 1-5.464 4.955 5.493 5.493 0 0 1-5.487-5.487A5.49 5.49 0 0 1 7.89 3.835v1.762c0 .426.515.64.815.339L11.4 3.242v-.405L8.707.14a.469.469 0 0 0-.34-.14Z"/>
<path d="m7.554 11.454-2.29-2.29c-.552-.581.29-1.424.87-.872l1.767 1.766 3.405-3.407a.617.617 0 0 1 .872.872L8.25 11.45z"/>
</svg>

After

Width:  |  Height:  |  Size: 641 B

3
icons/shield-task.svg Normal file
View file

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M14.6 2.4c-2.13 0-4.206-.754-6.24-2.28a.6.6 0 0 0-.72 0C5.606 1.646 3.53 2.4 1.4 2.4a.6.6 0 0 0-.6.6v4.2c0 4 2.366 6.94 6.98 8.758a.6.6 0 0 0 .44 0C12.834 14.141 15.2 11.2 15.2 7.2V3a.6.6 0 0 0-.6-.6Zm-2.794 3.442-4.8 4.4a.6.6 0 0 1-.83-.018l-2-2a.6.6 0 1 1 .848-.848L6.618 8.97l4.376-4.012a.6.6 0 0 1 .812.884z"/>
</svg>

After

Width:  |  Height:  |  Size: 473 B

4
icons/tab-copy.svg Normal file
View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M3.662 4.678a2 2 0 0 0-2 2v4.601H.998c-1.332.002-1.332 1.527 0 1.527h14c1.335.002 1.335-1.527 0-1.527v.002h-1V6.678a2 2 0 0 0-2-2zm.565 1.066h7.035a1.11 1.11 0 0 1 1.113 1.113v4.424H3.113V6.857a1.11 1.11 0 0 1 1.114-1.113z"/>
<path d="M12.5 2.721a3.5 3.5 0 0 1 3.5 3.5v2.5c0 .819-.393 1.545-1 2v-4.5a2.5 2.5 0 0 0-2.5-2.5H3c.456-.606 1.182-1 2-1z"/>
</svg>

After

Width:  |  Height:  |  Size: 510 B

4
icons/tab-unload.svg Normal file
View file

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M4 3a2 2 0 0 0-2 2v6H1a1 1 0 0 0 0 2h5.707a5.297 5.297 0 0 1-.049-.709 5.297 5.297 0 0 1 5.297-5.299A5.297 5.297 0 0 1 14 7.404V5a2 2 0 0 0-2-2Z"/>
<path d="M12.098 8.823c-1.423.007-2.729.726-3.408 1.879V9.497c0-.3-.487-.3-.487 0v2.245c0 .124.109.224.243.224h2.435a.225.225 0 0 0 0-.449H9.344a.413.413 0 0 0 .027-.038c1.137-2.817 5.659-2.062 5.659.94 0 3-4.522 3.756-5.659.939-.235-.544-1.121-.239-.912.314 1.104 2.711 5.056 3.162 6.843.781 1.786-2.381-.064-5.633-3.204-5.63Z"/>
</svg>

After

Width:  |  Height:  |  Size: 639 B

View file

@ -1,3 +1,4 @@
#sidebar-header,
#sidebar {
min-width: var(--uc-sidebar-width) !important;
max-width: var(--uc-sidebar-width) !important;
@ -5,9 +6,12 @@
will-change: min-width, max-width;
}
#sidebar-box:is(:hover, :focus-within) > #sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
#sidebar-box:is(:hover, :focus-within) > {
#sidebar-header,
#sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
}
:root[inFullscreen="true"] #sidebar-box {
@ -29,12 +33,16 @@
}
@include Animate {
#sidebar-header,
#sidebar {
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 {
transition-delay: 0ms !important;
#sidebar-box:is(:hover, :focus-within) > {
#sidebar-header,
#sidebar {
transition-delay: 0ms !important;
}
}
:root[inFullscreen="true"] #sidebar-box {

View file

@ -191,6 +191,12 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5);
/* -moz-default-appearance: -moz-window-titlebar */
appearance: none !important;
}
@include OS($win7, $win8) {
&[sizemode="maximized"] #titlebar {
// Only win7, win8 #480
padding-top: 8px; // Don't use margin-top for reserved fullscreen animation
}
}
}
@include Option("userChrome.compatibility.os.windows_maximized") {
&[sizemode="maximized"] #titlebar {

View file

@ -230,6 +230,9 @@ menu.share-tab-url-item {
#sync-reauthitem {
}
#menu_openFirefoxView {
--menuitem-image: url("chrome://branding/content/icon32.png");
}
#webDeveloperMenu, /* Legacy */
#browserToolsMenu {
--menuitem-image: url("../icons/developer.svg");

View file

@ -261,3 +261,43 @@
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
}
/*= Tab Mix Plus =============================================================*/
#tm-autoreload_menu {
--menuitem-image: url("../icons/reload-auto.svg");
}
#tm-linkWithhistory {
}
#tm-openAllLinks {
--menuitem-image: url("../icons/new-tab-multiple.svg");
}
#tm-openinverselink {
}
#context-openlinkinusercontext-menu {
}
#tm-content-closetab {
}
#tm-duplicateTabContext {
}
#tm-duplicateinWinContext {
}
#tm-detachTabContext {
}
#tm-mergeWindows {
}
#tm-content-freezeTab {
}
#tm-content-protectTab {
}
#tm-content-lockTab {
}
#tm-tabsList {
}
#tm-content-undoCloseTab {
--menuitem-image: url("../icons/undo.svg");
}
#tm-content-undoCloseList {
}

View file

@ -138,6 +138,9 @@
--menuitem-image: url("chrome://browser/skin/edit-paste.svg");
}
#paste-and-go {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/edit-paste-go.svg");
}
}
#urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
@ -175,6 +178,9 @@
/* Only searchbar */
menuitem.searchbar-paste-and-search {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/edit-paste-search.svg");
}
}
menuitem.searchbar-clear-history {
--menuitem-image: url("chrome://browser/skin/forget.svg");

View file

@ -55,9 +55,10 @@
#treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
#tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
#sidebartabs_asamuzak_jp-menuitem-_dupeTab {
--menuitem-image: url("../icons/notebook-subsection.svg");
--menuitem-image: url("../icons/tab-copy.svg");
}
#tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
--menuitem-image: url("../icons/tab-unload.svg");
}
#context_bookmarkTab,
@ -119,10 +120,13 @@
#sidebartabs_asamuzak_jp-menuitem-_closeTab {
--menuitem-image: url("chrome://global/skin/icons/close.svg");
}
#context_closeTabOptions,
#treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs,
#tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs,
#sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs {
}
#context_closeTabOptions {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/filter-dismiss.svg");
}
}
#context_undoCloseTab,
#treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab,
@ -215,3 +219,53 @@ menuitem.viewCustomizeToolbar {
#toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] {
--menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
}
/*= Tab Mix Plus =============================================================*/
#context_openANewTab.tabmix-newtab-menu-icon {
list-style-image: var(--menuitem-image) !important;
}
#tm-duplicateinWin {
}
#tm-mergeWindowsTab {
}
#tm-renameTab {
}
#tm-copyTabUrl {
--menuitem-image: url("../icons/link.svg");
}
#tm-autoreloadTab_menu {
}
#context_reloadTabOptions {
--menuitem-image: url("../icons/reload.svg");
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/filter-reload.svg");
}
+ #context_reloadTab {
@include NotOption("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/blank.svg");
}
}
}
#tm-undoCloseList {
}
#tm-docShell {
}
#tm-freezeTab {
}
#tm-protectTab {
--menuitem-image: url("../icons/shield-task.svg");
}
#tm-lockTab {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/lock-closed.svg");
}
}
#context_bookmarkAllTabs {
@include Option("userChrome.icon.menu.full") {
--menuitem-image: url("../icons/bookmark-multiple.svg");
}
}

View file

@ -41,6 +41,10 @@ $_layoutCommonMenus: (
@include _layoutInitIconMenus {
@include _layout_icon_menus;
}
#tabContextMenu > .tabmix-newtab-menu-icon {
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
}
/* For native context menus */
#{$_nestedPopupIconMenus} {

View file

@ -43,7 +43,20 @@
}
}
}
:root {
/* Works with TabMixPlus */
--tab-min-height_mlt: calc(var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px)))) !important;
}
#TabsToolbar[multibar] .tabbrowser-tab {
height: unset !important; /* Original: var(--tab-min-height_mlt) */
}
@include Option("userChrome.tab.connect_to_window") {
:root {
--tab-min-height_mlt: calc(var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px))) !important;
}
#TabsToolbar {
--toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important; /* Prevent overflow pinned tab bottom margin */
}
@ -61,11 +74,6 @@
}
}
/* Works with TabMixPlus */
#TabsToolbar[multibar] .tabbrowser-tab {
height: unset !important; /* Original: var(--tab-min-height_mlt) */
}
/* Scroll Button - Size Fix */
:root #tabbrowser-arrowscrollbox {
--scrollbtn-vertical-padding: 3px;

View file

@ -46,8 +46,17 @@
overflow: hidden;
}
#sidebar-header {
font-size: unset !important;
> #sidebar-switcher-target {
font-size: 1.333em;
}
}
@include NotOption("userChrome.autohide.sidebar") {
#sidebar-box,
#sidebar-header,
#sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
@ -58,7 +67,7 @@
will-change: padding-inline;
&:not([hidden="true"]) {
padding-inline-start: var(--uc-sidebar-activate-width);
padding-inline-start: var(--uc-sidebar-activate-width) !important;
}
@include Animate {