Merge branch 'nightly'

zapSNH · Sep 1, 2024 · 43d7745 · 43d7745
2 parents 499b680 + a3d55e7
commit 43d7745
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 13 deletions.
diff --git a/resources/content.css b/resources/content.css
@@ -326,6 +326,15 @@
 			scale: 1;
 		}
 	}
+
+	.icon {
+		&[src="chrome://global/skin/icons/info-filled.svg"] {
+			content: url("./icons/info-color.svg") !important;
+		}
+		&[src="chrome://global/skin/icons/warning.svg"] {
+			content: url("./icons/warning-16.svg") !important;
+		}
+	}
 	/* context menus */
 	panel-list {
 		border-radius: 0 !important;
@@ -1055,15 +1064,6 @@
 		}
 	}
 
-	.icon {
-		&[src="chrome://global/skin/icons/info-filled.svg"] {
-			content: url("./icons/info-color.svg") !important;
-		}
-		&[src="chrome://global/skin/icons/warning.svg"] {
-			content: url("./icons/warning-16.svg") !important;
-		}
-	}
-
 	.addon-icon[src="chrome://mozapps/skin/extensions/extensionGeneric.svg"] {
 		content: url("./icons/extensions.svg") !important;
 	}
@@ -1533,6 +1533,9 @@
 	* {
 		--shopping-card-border-radius: var(--photon-primary-border-radius) !important;
 	}
+	.onboardingContainer.shopping .screen[pos="split"] {
+		border-radius: var(--photon-primary-border-radius) !important;
+	}
 	#close-button {
 		background-image: url(./icons/close.svg) !important;
 	}
@@ -1551,14 +1554,31 @@
  	.packaging\/appearance {
  		content: url("./icons/packaging.svg") !important;
 	}
+	.highlight-item-wrapper {
+		column-gap: 0.67em !important;
+	}
+	shopping-message-bar {
+		--info-icon: url(./icons/info.svg);
+	}
+	.shopping-message-bar:not(.analysis-in-progress, #reanalysis-in-progress-message) .icon {
+		background-image: var(--info-icon) !important;
+	}
 	@media (prefers-color-scheme: dark) {
 		.shopping-card {
 			background: var(--grey-60) !important;
 			--shopping-card-border-color: var(--in-content-box-border-color) !important;
 		}
 		.show-more footer {
-			background-color: var(--grey-60) !important;;
-			box-shadow: 2px -10px 11px var(--grey-60) !important;;
+			background-color: var(--grey-60) !important;
+			box-shadow: 2px -10px 11px var(--grey-60) !important;
+		}
+		@media (prefers-contrast: no-preference) {
+			.onboardingContainer.shopping .screen[pos="split"] {
+				box-shadow: none !important;
+				.section-main .main-content {
+					background-color: var(--grey-60) !important;
+				}
+			}
 		}
 	}
 }

diff --git a/resources/icons.css b/resources/icons.css
@@ -377,6 +377,12 @@
 		list-style-image: url(./icons/shopping-open.svg) !important;
 	}
 }
+img[src="chrome://browser/content/shopping/assets/shopping.svg"] {
+	content: url(./icons/shopping.svg) !important;
+}
+.dismiss-button {
+	background-image: url(./icons/close.svg) !important;
+}
 #downloads-indicator-anchor {
 	list-style-image: url(./icons/download-icons.svg#arrow-with-bar) !important;
 }
@@ -397,7 +403,7 @@
 	list-style-image: url(./icons/notification-finish-animation-r2.svg) !important;
 }
 #downloads-button[attention="success"] > .toolbarbutton-badge-stack > #downloads-indicator-anchor > #downloads-indicator-icon {
-  fill: var(--photon-accent) !important;
+	fill: var(--photon-accent) !important;
 }
 #library-button {
 	list-style-image: url(./icons/library.svg) !important;
@@ -1518,6 +1524,12 @@ img[src="chrome://browser/skin/preferences/category-general.svg"] {
 .header-close-button {
 	--button-icon: url(./icons/close.svg) !important;
 }
+.menu-button {
+	--button-icon: url(./icons/more.svg) !important;
+}
+.delete-button {
+	--button-icon: url(./icons/delete.svg) !important;
+}
 button[part="button"] {
 	background-image: var(--button-icon, inherit) !important;
 }
diff --git a/resources/tabs-and-urlbar.css b/resources/tabs-and-urlbar.css
@@ -1,4 +1,4 @@
-/* Tabs and URLbar */
+/* Tabs and URL Bar */
 /* And sidebar */
 /* Adjustments for each UI density */
 :root:not([uidensity="compact"], [uidensity="touch"]) {

diff --git a/resources/theme.css b/resources/theme.css
@@ -71,6 +71,8 @@ input.findbar-textbox:focus {
 	--in-content-primary-button-background: var(--photon-accent) !important;
 	--in-content-primary-button-background-hover: color-mix(in srgb, var(--photon-accent) 80%, white) !important;
 	--in-content-primary-button-background-active: color-mix(in srgb, var(--photon-accent) 60%, white) !important;
+	--chrome-content-separator-color: var(--lwt-accent-color) !important;
+
 	#urlbar {
 		--urlbar-box-hover-bgcolor: hsla(0,0%,70%,.2) !important;
 		--urlbar-box-active-bgcolor: hsla(0,0%,70%,.3) !important;
@@ -129,6 +131,7 @@ input.findbar-textbox:focus {
 			--in-content-primary-button-background-hover: color-mix(in srgb, var(--photon-accent) 80%, white) !important;
 			--in-content-primary-button-background-active: color-mix(in srgb, var(--photon-accent) 60%, white) !important;
 			--toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor) !important;
+		--chrome-content-separator-color: var(--lwt-accent-color) !important;
 
 			#urlbar {
 				--urlbar-box-hover-bgcolor: hsla(0,0%,70%,.2) !important;
@@ -218,6 +221,7 @@ input.findbar-textbox:focus {
 	--in-content-primary-button-background-active: color-mix(in srgb, var(--photon-accent) 60%, white) !important;
 	--lwt-sidebar-background-color: var(--toolbar-bgcolor) !important;
 	--sidebar-background-color: var(--lwt-sidebar-background-color) !important;
+	--chrome-content-separator-color: var(--lwt-accent-color) !important;
 
 	&:not(:-moz-window-inactive) {
 		--lwt-toolbar-field-highlight: var(--photon-accent-dark);
@@ -295,6 +299,7 @@ input.findbar-textbox:focus {
 			--sidebar-border-color: rgba(255, 255, 255, 0.1) !important;
 			--toolbar-non-lwt-bgcolor: var(--toolbar-bgcolor) !important;
 			--tabs-navbar-separator-color: transparent !important;
+			--chrome-content-separator-color: var(--lwt-accent-color) !important;
 
 			&:not(:-moz-window-inactive) {
 				::selection {