Merge branch 'master' into dev

black7375 · Nov 10, 2022 · eccf2f8 · eccf2f8
2 parents 196fb4c + 66c4ee7
commit eccf2f8
Show file tree

Hide file tree

Showing 31 changed files with 228 additions and 78 deletions.
diff --git a/CREDITS b/CREDITS
@@ -19,6 +19,17 @@ N: Yunsup Sim
 E: pedogunu@gmail.com
 W: https://ethansup.net
 
+----------
+    Sponsors
+
+N: Jani Haiko
+E: haiko.jani@gmail.com
+W: https://github.com/ojaha065
+
+N: nikkehtine
+E: nikkehtine@int.pl
+W: https://github.com/nikkehtine
+
 ----------
     Contributors
 

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
@@ -1453,17 +1453,17 @@
   }
   /*== 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;
   }
   .notification-button:hover {
-    background-color: var(--button-hover-bgcolor);
+    background-color: var(--button-hover-bgcolor) !important;
   }
   .notification-button:hover:active {
-    background-color: var(--button-active-bgcolor);
+    background-color: var(--button-active-bgcolor) !important;
   }
 
   html|button.ghost-button:not(.semi-transparent):enabled:hover {
@@ -3802,7 +3802,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 {
@@ -3823,7 +3823,7 @@
 /*= BookMark Bar - Reduce Height =============================================*/
 @supports -moz-bool-pref("userChrome.padding.bookmarkbar") {
   :root[uidensity="compact"] #PersonalToolbar toolbarbutton {
-    margin-top: 0px;
+    margin-top: 0px !important;
     /* Original: 2px */
   }
 }
@@ -4045,7 +4045,7 @@
 /*= Panel - Reduce padding ===================================================*/
 @supports -moz-bool-pref("userChrome.padding.panel") {
   :root {
-    --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding) !important;
+    --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important;
     /* Original: 0 8px */
     --arrowpanel-menuitem-padding-block: 5px !important;
     /* Original: 8px */
@@ -4109,7 +4109,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 */
@@ -6619,7 +6619,9 @@
   }
 }
 /*= Selected Tab - Photon like contextline ===================================*/
-@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.bar_separator") {
+@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.static_separator") or -moz-bool-pref(
+    "userChrome.tab.bar_separator"
+  ) {
   :root[lwtheme-mozlightdark] #tabbrowser-tabs,
   :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);"] {
@@ -6861,6 +6863,14 @@
       .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 */
   @media (prefers-reduced-motion: no-preference) {
@@ -7088,18 +7098,10 @@
   :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;
-  }
 }
 /*= Unloaded Tab - Contents Opacity ===========================================*/
 @supports -moz-bool-pref("userChrome.tab.unloaded") {
-  #tabbrowser-tabs .tabbrowser-tab[pending] .tab-content {
+  .tabbrowser-tab[pending] .tab-content {
     opacity: 0.7;
   }
 }
@@ -7443,7 +7445,7 @@
       --uc-sound-tab-no-icon-label-position-x: 3px;
     }
     .tabbrowser-tab .tab-label-container[labeldirection="rtl"],
-    .tabbrowser-tab .tab-label-container :not([labeldirection]):-moz-locale-dir(rtl) {
+    .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) {
       --uc-sound-tab-no-icon-position-x: 0.5px;
       --uc-sound-tab-no-icon-label-position-x: -3px;
     }
@@ -9417,7 +9419,7 @@
         #forward-button,
         #clearDownloadsButton {
           fill: currentColor !important;
-          -moz-context-properties: fill !important;
+          -moz-context-properties: fill, fill-opacity, stroke !important;
         }
 
         /* Add */
@@ -9555,13 +9557,12 @@
     .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,
@@ -9769,7 +9770,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;
       background-position: left center;
@@ -10037,7 +10038,7 @@
     /*= 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;
     }
@@ -10131,7 +10132,7 @@
     #BMB_viewBookmarksToolbar,
     #context_openANewTab.tabmix-newtab-menu-icon {
       /* Color */
-      -moz-context-properties: fill, fill-opacity !important;
+      -moz-context-properties: fill, fill-opacity, stroke !important;
       fill: currentColor !important;
       /* Layout */
       background-size: 16px !important;
@@ -10140,7 +10141,7 @@
     }
 
     #tabContextMenu > .tabmix-newtab-menu-icon {
-      -moz-context-properties: fill, fill-opacity !important;
+      -moz-context-properties: fill, fill-opacity, stroke !important;
       fill: currentColor !important;
     }
 
@@ -10664,14 +10665,38 @@
       }
 
       /*= Tab Mix Plus =============================================================*/
-      #context_openANewTab.tabmix-newtab-menu-icon {
-        list-style-image: var(--menuitem-image) !important;
+      @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) {
+        #context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left {
+          display: none;
+        }
+      }
+
+      @supports -moz-bool-pref("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/timer10.svg");
+      }
+
       #context_reloadTabOptions {
         --menuitem-image: url("../icons/reload.svg");
       }
@@ -10686,6 +10711,14 @@
         }
       }
 
+      #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");
       }
@@ -11023,13 +11056,53 @@
       }
       /*= Tab Mix Plus =============================================================*/
       #tm-autoreload_menu {
-        --menuitem-image: url("../icons/reload-auto.svg");
+        --menuitem-image: url("../icons/timer10.svg");
+      }
+
+      #tm-linkWithhistory {
+        --menuitem-image: url("../icons/new-tab-skip-forward.svg");
       }
 
       #tm-openAllLinks {
         --menuitem-image: url("../icons/new-tab-multiple.svg");
       }
 
+      #tm-openinverselink {
+        --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-content-undoCloseTab {
         --menuitem-image: url("../icons/undo.svg");
       }
@@ -11193,6 +11266,19 @@
         --menuitem-image: url("../icons/movetowindow-16.svg");
       }
 
+      /*= Notification =============================================================*/
+      #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");
@@ -11802,10 +11888,7 @@
         --menuitem-image: url("chrome://global/skin/icons/info.svg");
       }
     }
-  }
-  /** Library Menu **************************************************************/
-  @supports -moz-bool-pref("userChrome.icon.library") {
-    @supports -moz-bool-pref("userChrome.icon.menu") {
+    @supports -moz-bool-pref("userChrome.icon.library") {
       /*= organizeButtonPopup ======================================================*/
       #newbookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");

diff --git a/css/leptonContent.css b/css/leptonContent.css
@@ -280,7 +280,7 @@
 
     .context-menu-list .context-menu-item button span {
       /* Color */
-      -moz-context-properties: fill, fill-opacity !important;
+      -moz-context-properties: fill, fill-opacity, stroke !important;
       fill: currentColor !important;
       /* Layout */
       background-size: 16px !important;
@@ -417,7 +417,7 @@
     }
   }
   /** Activity Stream - Home Search Bar looks like proton *********************/
-  @supports -moz-bool-pref("userContent.newTab.animate") {
+  @supports -moz-bool-pref("userContent.newTab.searchbar") {
     /* Dropdown Colors */
     #root {
       --newtab-search-background-color: rgba(255, 255, 255, 1);
@@ -1680,6 +1680,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,
@@ -1704,7 +1705,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;
       }
@@ -2362,7 +2365,7 @@
       #forward-button,
       #clearDownloadsButton {
         fill: currentColor !important;
-        -moz-context-properties: fill !important;
+        -moz-context-properties: fill, fill-opacity, stroke !important;
       }
 
       /* Add */
@@ -3037,7 +3040,7 @@
         > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
       menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
         /* Color */
-        -moz-context-properties: fill, fill-opacity !important;
+        -moz-context-properties: fill, fill-opacity, stroke !important;
         fill: currentColor !important;
         /* Layout */
         background-size: 16px !important;

diff --git a/icons/merge.svg b/icons/merge.svg
diff --git a/icons/new-tab-forward.svg b/icons/new-tab-forward.svg