Merge pull request #9694 from awesomemotive/release/3.2.4

Adding EDD 3.2.4 changes
awesomemotive · Nov 6, 2023 · 675bd93 · 675bd93
2 parents f39f402 + c91824c
commit 675bd93
Show file tree

Hide file tree

Showing 370 changed files with 9,357 additions and 3,441 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -67,7 +67,6 @@ module.exports = function ( grunt ) {
 					'languages/**',
 					'libraries/**',
 					'templates/**',
-					'vendor/**',
 					'src/**',
 					'*.php',
 					'*.txt',
@@ -77,7 +76,12 @@ module.exports = function ( grunt ) {
 					'!vendor/**',
 					'vendor/autoload.php',
 					'vendor/composer/**',
-					'vendor/symfony/deprecation-contracts/**'
+					'vendor/symfony/deprecation-contracts/**',
+					'vendor/symfony/polyfill-php80/**',
+					'vendor/symfony/polyfill-mbstring/**',
+					'vendor/symfony/service-contracts/**',
+					'vendor/symfony/translation/**',
+					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>-pro/',
 			},
@@ -102,7 +106,6 @@ module.exports = function ( grunt ) {
 					'languages/**',
 					'libraries/**',
 					'templates/**',
-					'vendor/**',
 					'src/**',
 					'*.php',
 					'*.txt',
@@ -112,7 +115,12 @@ module.exports = function ( grunt ) {
 					'!vendor/**',
 					'vendor/autoload.php',
 					'vendor/composer/**',
-					'vendor/symfony/deprecation-contracts/**'
+					'vendor/symfony/deprecation-contracts/**',
+					'vendor/symfony/polyfill-php80/**',
+					'vendor/symfony/polyfill-mbstring/**',
+					'vendor/symfony/service-contracts/**',
+					'vendor/symfony/translation/**',
+					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>/',
 			},
@@ -133,13 +141,17 @@ module.exports = function ( grunt ) {
 					'libraries/**',
 					'!node_modules/**',
 					'templates/**',
-					'vendor/**',
 					'src/**',
 					'!assets/pro/**',
 					'!vendor/**',
 					'vendor/autoload.php',
 					'vendor/composer/**',
-					'vendor/symfony/deprecation-contracts/**'
+					'vendor/symfony/deprecation-contracts/**',
+					'vendor/symfony/polyfill-php80/**',
+					'vendor/symfony/polyfill-mbstring/**',
+					'vendor/symfony/service-contracts/**',
+					'vendor/symfony/translation/**',
+					'vendor/symfony/translation-contracts/**',
 				],
 				dest: 'build/<%= pkg.name %>-public/',
 			}

diff --git a/assets/css/admin/gateways/stripe.scss b/assets/css/admin/gateways/stripe.scss
@@ -1,5 +1,7 @@
 @import "~@wordpress/base-styles/colors";
 @import "~@wordpress/base-styles/colors.native";
+
+@import "../../variables/colors";
 /**
  * WordPress Core colors current as of 5.5.1.
  */
@@ -159,7 +161,7 @@ $buddypress-colors: (
 }
 
 .edds-stripe-connect-acount-info span.edd-pro-upgrade a {
-	color: #1da867;
+	color: $edd-pro-upgrade;
 	font-weight: 600;
 	text-decoration: none;
 }
@@ -210,4 +212,4 @@ only screen and (min-device-pixel-ratio: 1.5) {
 	transition: 0.1s transform ease;
 	border-radius: 50%;
 	background: white;
-}
+}
diff --git a/assets/css/admin/general/_admin.scss b/assets/css/admin/general/_admin.scss
@@ -0,0 +1,62 @@
+body.edd-admin-page {
+
+	@media (min-width: $break-medium) {
+		& #wpbody-content {
+			padding-bottom: 200px;
+		}
+	}
+
+	& #wpfooter {
+		.edd-footer-promotion {
+			text-align: center;
+			font-weight: 400;
+			font-size: 13px;
+			line-height: 16px;
+			color: $wp-gray-40;
+			padding: 20px 0 30px 0;
+			margin-bottom: 20px;
+			margin-top: 20px;
+
+			& p {
+				font-weight: 600;
+			}
+
+			& .edd-footer-promotion-links, .edd-footer-promotion-social {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			& .edd-footer-promotion-links {
+				margin: 9px 0 0;
+
+				& span {
+					color: $wp-gray-10;
+					padding: 0 7px;
+				}
+			}
+
+			& .edd-footer-promotion-social {
+				margin: 10px 0 0 0;
+				gap: 10px;
+
+				& li {
+					margin-bottom: 0;
+
+					& path {
+						fill: $edd-footer-social-link;
+					}
+
+					&:hover path {
+						fill: $edd-footer-social-link-hover;
+					}
+				}
+
+				& a {
+					display: block;
+					height: 16px;
+				}
+			}
+		}
+	}
+}
diff --git a/assets/css/admin/general/_pointers.scss b/assets/css/admin/general/_pointers.scss
@@ -0,0 +1,13 @@
+.edd-pointer {
+	&.warning {
+		& h3 {
+			background: $alert-yellow;
+			border-color: $wp-yellow-50;
+			color: $gray-900;
+
+			&:before {
+				color: $alert-yellow;
+			}
+		}
+	}
+}
diff --git a/assets/css/admin/general/_upgrade.scss b/assets/css/admin/general/_upgrade.scss
@@ -1,6 +1,13 @@
 .edd-pro-upgrade,
 .edd-pro-upgrade:hover{
-	color: #1da867;
+	color: $edd-pro-upgrade;
 	font-weight: 600;
 	text-decoration: none;
 }
+
+.button.edd-pro-upgrade,
+.button.edd-pro-upgrade:hover {
+	background-color: $edd-pro-upgrade;
+	color: $white;
+	border-color: $edd-pro-upgrade;
+}
diff --git a/assets/css/admin/general/style.scss b/assets/css/admin/general/style.scss
@@ -1,5 +1,7 @@
+@import "admin";
 @import "dialog";
 @import "item-header";
 @import "status-badge";
 @import "upgrade";
 @import "progress-bar";
+@import "pointers";
diff --git a/assets/css/admin/menu.scss b/assets/css/admin/menu.scss
@@ -21,6 +21,12 @@
 	}
 }
 
+@media screen and (max-width: $break-mobile) {
+	#menu-posts-download.wp-not-current-submenu .wp-submenu {
+		display: none;
+	}
+}
+
 /* Submenu Styles
 -------------------------------------------------------------- */
 
@@ -90,7 +96,7 @@ a.edd-onboarding__menu-item {
 
 a.edd-sidebar__upgrade-pro,
 a.edd-sidebar__upgrade-pro:hover {
-	background-color: #1da867 !important;
+	background-color: $edd-pro-upgrade !important;
 	color: $white !important;
 	font-weight: 600;
 }