Merge pull request #9793 from awesomemotive/release/3.5.0

Release 3.5.0

Author: cklosowski

Gruntfile.js

@@ -66,11 +66,11 @@ module.exports = function ( grunt ) {
 					'!includes/blocks/package-lock.json',
 					'languages/**',
 					'libraries/**',
+					'pro/**',
 					'templates/**',
 					'src/**',
 					'!src/Lite/**',
 					'*.php',
-					'*.txt',
 					'!vendor/**',
 					'vendor/autoload.php',
 					'vendor/composer/**',

assets/css/admin/customers/_details.scss

@@ -0,0 +1,98 @@
+@use "~@wordpress/base-styles/breakpoints" as wp-breakpoints;
+
+.edd-item-info.customer-info {
+	input[type="text"],
+	input[type="password"],
+	input[type="tel"],
+	select {
+		width: 200px;
+		box-shadow: none;
+		transition: none;
+		border: 1px solid #ddd;
+		font-size: 13px;
+		padding: 2px 4px;
+	}
+}
+
+.customer-info {
+	display: flex;
+	gap: 1em;
+
+	.customer-name {
+		font-size: 24px;
+		font-weight: 600;
+	}
+
+	.customer-name.editable {
+		margin-bottom: 6px;
+	}
+
+	.customer-main-wrapper input[name="customerinfo[name]"] {
+			font-size: 24px;
+		}
+
+	.customer-address-wrapper {
+		margin-top: -3px;
+		margin-right: 50px;
+		width: 202px;
+		margin-left: auto;
+		order: 2;
+	}
+
+	.customer-address {
+		span[data-key="address"],
+		span[data-key="address2"],
+		span[data-key="country"] {
+			display: block;
+		}
+	}
+
+	@media screen and (max-width: wp-breakpoints.$break-small) {
+		flex-wrap: wrap;
+
+		.customer-name {
+			font-size: 16px;
+		}
+
+		.customer-address-wrapper {
+			margin: 0;
+			width: 100%;
+		}
+	}
+}
+
+.customer-edit-link a {
+	font-weight: normal;
+	text-decoration: none;
+}
+
+.disconnect-user a {
+	color: #aaa;
+	font-size: 20px;
+}
+
+#customer-edit-actions {
+	padding: 3px;
+	line-height: 28px;
+	text-align: center;
+
+	.button-secondary {
+		margin-right: 5px;
+	}
+
+	.cancel {
+		padding: 5px;
+	}
+}
+
+.customer-main-wrapper .info-item > .edd-toggle {
+	margin-top: 8px;
+}
+
+@media screen and (max-width: wp-breakpoints.$break-small) {
+	.edd-sections-wrap .section-wrap {
+		.customer-id {
+			display: none;
+		}
+	}
+}

assets/css/admin/customers/style.scss

@@ -0,0 +1 @@
+@import "details";

assets/css/admin/forms/_select.scss

@@ -0,0 +1,10 @@
+@use "../../variables/icons" as icons;
+
+.edd-select {
+	& option {
+		&[disabled] {
+			color: #666;
+			cursor: not-allowed;
+		}
+	}
+}

assets/css/admin/forms/style.scss

@@ -3,3 +3,4 @@
 @use "general";
 @use "multicheck";
 @use "form-fields";
+@use "select";

assets/css/admin/general/_upgrade.scss

@@ -5,6 +5,12 @@
 	color: colors.$edd-pro-upgrade;
 	font-weight: 600;
 	text-decoration: none;
+
+	&.button-link,
+	&.button-link:hover {
+		color: colors.$edd-pro-upgrade !important;
+		text-decoration: none !important;
+	}
 }
 
 .button.edd-pro-upgrade,

assets/css/admin/orders/_customer.scss

@@ -1,3 +1,30 @@
 .edd-order-customer__actions {
 	margin-bottom: 2em;
 }
+
+.order-customer-info {
+	.customer-details-wrap {
+		margin: 15px 0;
+		align-items: center;
+		gap: 10px;
+
+		.spinner {
+			margin: 0;
+		}
+	}
+
+	.customer-details {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.customer-details .customer-since {
+		color: #666;
+		display: block;
+		margin: 4px 0 6px;
+	}
+
+	.customer-details > span {
+		margin-bottom: 5px;
+	}
+}

assets/css/admin/promos/_overlay.scss

@@ -12,7 +12,7 @@
 	right: 0;
 	bottom: 0;
 	left: 160px;
-	z-index: 110;
+	z-index: 9999;
 	justify-content: center;
 	align-items: center;
 

assets/css/admin/sections/style.scss

@@ -55,6 +55,7 @@
 
 		.customer-section:not(:last-child) {
 			border-bottom: 1px solid #eee;
+			padding-bottom: 20px;
 		}
 
 		.customer-section table {
@@ -75,41 +76,18 @@
 		}
 
 		.avatar-wrap {
-			float: left;
-			padding-right: 10px;
 			text-align: center;
 		}
 
 		img.avatar {
 			border-radius: 5px;
 		}
 
-		.customer-main-wrapper {
-			float: left;
-		}
-
-		.customer-main-wrapper input[name="customerinfo[name]"] {
-			font-size: 24px;
-		}
-
-		.customer-address-wrapper {
-			float: right;
-			margin-top: -3px;
-			margin-right: 50px;
-			width: 202px;
-		}
-
 		.info-wrapper {
 			min-height: 125px;
 			overflow: visible;
 		}
 
-		.customer-address span[data-key="address"],
-		.customer-address span[data-key="address2"],
-		.customer-address span[data-key="country"] {
-			display: block;
-		}
-
 		a.delete {
 			color: #ff0000;
 			margin-right: 5px;
@@ -159,29 +137,11 @@
 
 @media screen and (max-width: 656px) {
 	.edd-sections-wrap .section-wrap {
-		.customer-address-wrapper {
-			float: none;
-			position: absolute;
-			top: 84px;
-			left: 165px;
-			max-width: 200px;
-		}
-
-		.customer-main-wrapper {
-			float: none;
-			position: absolute;
-			left: 165px;
-		}
-
 		#edd-item-stats-wrapper {
 			padding-left: 0;
 			padding-right: 0;
 		}
 
-		.customer-section {
-			margin-bottom: 0;
-		}
-
 		.widefat td.no-items,
 		.widefat td.column-primary,
 		.widefat th.column-primary {
@@ -190,10 +150,6 @@
 			overflow: hidden;
 			text-align: left;
 		}
-
-		.customer-id {
-			display: none;
-		}
 	}
 }
 

assets/css/admin/settings/_subnav.scss

@@ -48,8 +48,4 @@
 			font-weight: 600;
 		}
 	}
-
-	&__wrapper + .notice {
-		margin-left: 0;
-	}
 }