Merge branch 'master' into dev

src/autohide/sidebar/_overlap.scss

@@ -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 {

src/compatibility/_os.scss

@@ -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 {

src/icons/_global_menu.scss

@@ -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");

src/icons/context_menu/_content_area.scss

@@ -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 {
+}

src/icons/context_menu/_others.scss

@@ -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");

src/icons/context_menu/_tab_toolbar.scss

@@ -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");
+  }
+}

src/icons/layout/_menu.scss

@@ -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} {

src/padding/_tabbar_height.scss

@@ -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;

src/sidebar/_overlap.scss

@@ -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 {