Merge branch 'master' into dev

This commit is contained in:
alstjr7375 2022-11-10 11:02:00 +09:00
commit eccf2f8561
31 changed files with 228 additions and 78 deletions

View file

@ -101,7 +101,7 @@
}
/** Activity Stream - Home Search Bar looks like proton *********************/
@include Option("userContent.newTab.animate") {
@include Option("userContent.newTab.searchbar") {
/* Dropdown Colors */
#root {
--newtab-search-background-color: rgba(255, 255, 255, 1); /* Same as light theme's --panel-background */

View file

@ -46,6 +46,7 @@
.input-row input[type="tel"],
.input-row input[type="text"],
.input-row input::placeholder,
.input-text,
.firefox-family-services > ul > .firefox-service,
.faint,
.faint a,
@ -68,7 +69,9 @@
.input-row input[type="password"],
.input-row input[type="tel"],
.input-row input[type="text"],
.input-text,
header,
.card,
.bg-white:not(nav) {
background: var(--in-content-box-background) !important;
}

View file

@ -23,11 +23,7 @@
@include Option("userChrome.icon.global_menu") {
@import "global_menu";
}
}
/** Library Menu **************************************************************/
@include Option("userChrome.icon.library") {
@include Option("userChrome.icon.menu") {
@include Option("userChrome.icon.library") {
@import "library";
}
}

View file

@ -176,7 +176,7 @@
/* Color */
fill: currentColor;
fill-opacity: var(--toolbarbutton-icon-fill-opacity);
-moz-context-properties: fill;
-moz-context-properties: fill, fill-opacity, stroke;
background-size: 16px;
background-repeat: no-repeat;
@ -416,7 +416,7 @@ panelMenuBookmarkThisPage[starred] {
/*= protections-popup ========================================================*/
#protections-popup-settings-button > .protections-popup-settings-icon,
#protections-popup-show-report-button > .protections-popup-show-report-icon {
-moz-context-properties: fill;
-moz-context-properties: fill, fill-opacity, stroke;
fill: currentColor;
margin-inline-end: 1em;
}

View file

@ -264,34 +264,44 @@
/*= Tab Mix Plus =============================================================*/
#tm-autoreload_menu {
--menuitem-image: url("../icons/reload-auto.svg");
// --menuitem-image: url("../icons/reload-auto.svg");
--menuitem-image: url("../icons/timer10.svg");
}
#tm-linkWithhistory {
// ic_fluent_skip_forward_tab_24_regular
--menuitem-image: url("../icons/new-tab-skip-forward.svg");
}
#tm-openAllLinks {
--menuitem-image: url("../icons/new-tab-multiple.svg");
}
#tm-openinverselink {
}
#context-openlinkinusercontext-menu {
--menuitem-image: url("../icons/new-tab-forward.svg");
}
#tm-content-closetab {
--menuitem-image: url("../icons/dismiss-filled.svg");
}
#tm-duplicateTabContext {
--menuitem-image: url("../icons/tab-copy.svg");
}
#tm-duplicateinWinContext {
--menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg");
}
#tm-detachTabContext {
--menuitem-image: url("../icons/convert-range.svg");
}
#tm-mergeWindows {
--menuitem-image: url("../icons/merge.svg");
}
#tm-content-freezeTab {
--menuitem-image: url("../icons/weather-snowflake.svg");
}
#tm-content-protectTab {
--menuitem-image: url("../icons/shield-task.svg");
}
#tm-content-lockTab {
--menuitem-image: url("../icons/lock-closed.svg");
}
#tm-tabsList {
}

View file

@ -1,3 +1,15 @@
/*= Notification =============================================================*/
// https://github.com/mozilla/gecko-dev/blob/master/toolkit/components/alerts/alert.xhtml
#doNotDisturbMenuItem {
--menuitem-image: url(chrome://global/skin/media/pause-fill.svg);
}
#disableForOriginMenuItem {
--menuitem-image: url("chrome://global/skin/icons/blocked.svg");
}
#openSettingsMenuItem {
--menuitem-image: url("chrome://global/skin/icons/settings.svg");
}
/*= blockedPopupOptions ======================================================*/
#blockedPopupAllowSite {
--menuitem-image: url("chrome://global/skin/icons/check.svg");

View file

@ -222,19 +222,30 @@ menuitem.viewCustomizeToolbar {
/*= Tab Mix Plus =============================================================*/
#context_openANewTab.tabmix-newtab-menu-icon {
list-style-image: var(--menuitem-image) !important;
.menu-iconic-left {
@include OS($win) {
display: none;
}
}
}
#tm-duplicateinWin {
}
#tm-mergeWindowsTab {
@include Option("userChrome.icon.menu.full") {
#tm-duplicateinWin {
--menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg");
}
#tm-mergeWindowsTab {
--menuitem-image: url("../icons/merge.svg");
}
}
#tm-renameTab {
--menuitem-image: url("chrome://global/skin/icons/edit.svg");
}
#tm-copyTabUrl {
--menuitem-image: url("../icons/link.svg");
}
#tm-autoreloadTab_menu {
// --menuitem-image: url("../icons/reload-auto.svg");
--menuitem-image: url("../icons/timer10.svg");
}
#context_reloadTabOptions {
--menuitem-image: url("../icons/reload.svg");
@ -252,8 +263,10 @@ menuitem.viewCustomizeToolbar {
}
#tm-docShell {
--menuitem-image: url("chrome://browser/skin/permissions.svg");
}
#tm-freezeTab {
--menuitem-image: url("../icons/weather-snowflake.svg");
}
#tm-protectTab {
--menuitem-image: url("../icons/shield-task.svg");

View file

@ -43,7 +43,7 @@ $_layoutCommonMenus: (
@include _layout_icon_menus;
}
#tabContextMenu > .tabmix-newtab-menu-icon {
-moz-context-properties: fill, fill-opacity !important;
-moz-context-properties: fill, fill-opacity, stroke !important;
fill: currentColor !important;
}

View file

@ -44,7 +44,7 @@ $_initialMenus: selector.append(
// Icon
@mixin _layout_icon_menus() {
/* Color */
-moz-context-properties: fill, fill-opacity !important;
-moz-context-properties: fill, fill-opacity, stroke !important;
fill: currentColor !important;
/* Layout */

View file

@ -82,12 +82,11 @@
.subviewbutton:not(#appMenu-proton-update-banner) > image {
fill: currentColor !important;
fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important;
-moz-context-properties: fill !important;
-moz-context-properties: fill, fill-opacity, stroke !important;
}
#appMenu-zoomReduce-button2 > .toolbarbutton-icon,
#appMenu-zoomEnlarge-button2 > .toolbarbutton-icon {
stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important;
-moz-context-properties: fill, stroke !important;
}
#appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon,
#appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon {

View file

@ -6,7 +6,7 @@
#forward-button,
#clearDownloadsButton {
fill: currentColor !important;
-moz-context-properties: fill !important;
-moz-context-properties: fill, fill-opacity, stroke !important;
}
/* Add */

View file

@ -1,3 +1,3 @@
:root[uidensity="compact"] #PersonalToolbar toolbarbutton {
margin-top: 0px; /* Original: 2px */
margin-top: 0px !important; /* Original: 2px */
}

View file

@ -1,5 +1,5 @@
:root {
--arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding) !important; /* Original: 0 8px */
--arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */
--arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */
--arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */
--arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */

View file

@ -25,7 +25,7 @@
}
/* not cut off for Protection popup Footer on windows */
:root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
padding: 3px 0 10px !important;
padding: 0 !important;
}
/* Button and disabled category in Protection popup */
:root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,

View file

@ -7,7 +7,7 @@
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
height: var(--urlbar-height) !important;
padding-block: 0 !important;
padding-inline: 0 !important;
padding-inline: var(--urlbar-container-padding, 0px) !important;
}
#urlbar[breakout][breakout-extend] > #urlbar-background {

View file

@ -19,7 +19,10 @@
}
/*= Selected Tab - Photon like contextline ===================================*/
@include Option("userChrome.tab.photon_like_contextline", "userChrome.tab.bar_separator") {
@include Option(
"userChrome.tab.photon_like_contextline",
"userChrome.tab.static_separator",
"userChrome.tab.bar_separator") {
:root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */
:root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"],
:root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] {
@ -31,6 +34,7 @@
}
}
}
@include Option("userChrome.tab.photon_like_contextline") {
@import "selected_tab/photon_like_contextline";
}

View file

@ -1,3 +1,3 @@
#tabbrowser-tabs .tabbrowser-tab[pending] .tab-content {
.tabbrowser-tab[pending] .tab-content {
opacity: 0.7;
}

View file

@ -1,10 +1,3 @@
:root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon {
--toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px);
}
:root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon {
margin-left: 2px;
}
:root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon {
margin-left: 1px;
}

View file

@ -102,7 +102,7 @@
--uc-sound-tab-no-icon-label-position-x: 3px;
}
&[labeldirection=rtl],
:not([labeldirection]):-moz-locale-dir(rtl) {
&:not([labeldirection]):-moz-locale-dir(rtl) {
--uc-sound-tab-no-icon-position-x: 0.5px;
--uc-sound-tab-no-icon-label-position-x: -3px;
}

View file

@ -126,6 +126,13 @@
.tab-stack::before {
opacity: 0 !important;
}
:root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon {
margin-left: 2px;
}
:root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon {
margin-left: 1px;
}
}
/* Animate */

View file

@ -117,16 +117,16 @@ html#main-window menupopup:not(.in-menulist) {
/*== Info Bar Color ==========================================================*/
.container.infobar {
background-color: var(--urlbar-box-bgcolor);
background-color: var(--urlbar-box-bgcolor) !important;
}
.notification-button {
background-color: var(--button-bgcolor);
background-color: var(--button-bgcolor) !important;
&:hover {
background-color: var(--button-hover-bgcolor);
background-color: var(--button-hover-bgcolor) !important;
}
&:hover:active {
background-color: var(--button-active-bgcolor);
background-color: var(--button-active-bgcolor) !important;
}
}