Merge branch 'master' into proton-style

black7375 · Jan 23, 2024 · ba6cb8e · ba6cb8e
2 parents 2894fff + 4545b12
commit ba6cb8e
Show file tree

Hide file tree

Showing 20 changed files with 291 additions and 89 deletions.
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
diff --git a/icons/command-console.svg b/icons/command-console.svg
diff --git a/icons/command-eyedropper.svg b/icons/command-eyedropper.svg
diff --git a/icons/firefox-view.svg b/icons/firefox-view.svg
diff --git a/icons/flame.svg b/icons/flame.svg
diff --git a/icons/tab-photon.svg b/icons/tab-photon.svg
diff --git a/icons/translations.svg b/icons/translations.svg
diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss
@@ -160,3 +160,8 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] {
 #main-menubar {
   --panel-border-radius: var(--arrowpanel-border-radius);
 }
+
+/*= Infobar Align #858 =======================================================*/
+.container.infobar {
+  align-items: center !important;
+}
diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss
@@ -0,0 +1,9 @@
+#firefox-view-button {
+	list-style-image: url("../icons/firefox-view.svg") !important;
+}
+#reset-pbm-toolbar-button {
+	list-style-image: url("../icons/flame.svg") !important;
+}
+#translations-button-icon {
+	list-style-image: url("../icons/translations.svg") !important;
+}
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
@@ -282,21 +282,21 @@ menu.share-tab-url-item {
   --menuitem-image: url("../icons/command-frames.svg");
 }
 #menu_browserConsole {
-  --menuitem-image: url("chrome://devtools/skin/images/command-console.svg");
+  --menuitem-image: url("../icons/command-console.svg");
 }
 #menu_responsiveUI {
   /* checkbox */
   --menuitem-image: url("../icons/command-responsivemode.svg");
 }
 #menu_eyedropper {
   /* checkbox */
-  --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg");
+  --menuitem-image: url("../icons/command-eyedropper.svg");
 }
 #menu_pageSource {
   --menuitem-image: url("../icons/document-search.svg");
 }
 #extensionsForDevelopers {
-  --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg");
+  --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 
 /*= windowPopup ==============================================================*/

diff --git a/src/icons/_index.scss b/src/icons/_index.scss
@@ -70,5 +70,10 @@
   }
 }
 
+/** Icons - 1.25px Stroke Width ***********************************************/
+@include Option("userChrome.icon.1-25px_stroke") {
+  @import "1.25px_stroke";
+}
+
 /** Icons for fork browsers ***************************************************/
 @import "fork_browsers/index";
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
@@ -99,7 +99,7 @@
     list-style-image: url("chrome://global/skin/icons/search-glass.svg");
   }
   #appMenu-translate-button {
-    list-style-image: url(chrome://browser/skin/translations.svg);
+    list-style-image: url("../icons/translations.svg");
   }
   #appMenu-zoom-controls2::before, /* Legacy v104 */
   #appMenu-zoom-controls::before {
@@ -340,7 +340,7 @@ panelMenuBookmarkThisPage[starred] {
 /* Browser Console */
 #appmenu-developer-tools-view .subviewbutton:nth-last-child(5),
 #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) {
-  list-style-image: url("chrome://devtools/skin/images/command-console.svg");
+  list-style-image: url("../icons/command-console.svg");
 }
 /* Responsive Design Mode */
 #appmenu-developer-tools-view .subviewbutton:nth-last-child(4),
@@ -350,7 +350,7 @@ panelMenuBookmarkThisPage[starred] {
 /* Eyedropper */
 #appmenu-developer-tools-view .subviewbutton:nth-last-child(3),
 #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) {
-  list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg");
+  list-style-image: url("../icons/command-eyedropper.svg");
 }
 /* Page Source - Edge file-search.svg */
 #appmenu-developer-tools-view .subviewbutton:nth-last-child(2),
@@ -360,7 +360,7 @@ panelMenuBookmarkThisPage[starred] {
 /* Extensions for Devel */
 #appmenu-developer-tools-view .subviewbutton:nth-last-child(1),
 #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) {
-  list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 #appmenu-developer-tools-view .subviewbutton:last-child {
   margin-bottom: 6px !important;

diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss
@@ -15,7 +15,8 @@
 #spell-no-suggestions {
   --menuitem-image: url("../icons/text-proofing-tools.svg");
 }
-#spell-add-to-dictionary {
+#spell-add-to-dictionary,
+#spell-add-dictionaries {
   --menuitem-image: url("../icons/book-add.svg");
 }
 #spell-undo-add-to-dictionary {

diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
@@ -146,4 +146,29 @@ $_layoutCommonMenus: (
       list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
     }
   }
+
+  /* Exeptions */
+  // Mac unified extenstions #847
+  #unified-extensions-context-menu > menuitem::before {
+    padding-inline: 0 !important;
+  }
+
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem {
+    &:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+      padding-inline-start: 0 !important;
+    }
+
+    &:not(.menuitem-iconic):has(.menu-iconic-left) {
+      &[checked] {
+        padding-left: 4px !important;
+        background-image: none !important;
+      }
+      &[checked="true"] {
+        padding-left: calc(var(--context-menu-mac-padding) - 8px) !important;
+        .menu-iconic-text {
+          padding-left: 8px !important;
+        }
+      }
+    }
+  }
 }