Merge pull request #9776 from awesomemotive/release/3.3.6.1

Adding 3.3.6.0/1

assets/css/admin/downloads/_actions.scss

@@ -0,0 +1,14 @@
+.edd__handle-actions-order {
+	display: flex;
+	transition: opacity 0.25s ease-in-out;
+
+	button {
+		padding: 9px;
+		border: 0;
+		background: transparent;
+
+		&:disabled .dashicons {
+			opacity: 0.5;
+		}
+	}
+}

assets/css/admin/downloads/_prices.scss

@@ -1,3 +1,7 @@
+.edd-section-content__fields--custom {
+	display: grid;
+	gap: 20px;
+}
 
 .edd-custom-price-option {
 	&-sections-wrap {
@@ -11,8 +15,8 @@
 
 	&-section {
 		display: block;
-		padding: 10px 8px;
-		border-bottom: 1px solid rgba( 222, 222, 222, 0.3 );
+		padding: .5em .5em 20px .5em;
+		border-bottom: 1px solid $wp-border;
 
 		&-title {
 			display: block;
@@ -25,10 +29,6 @@
 			gap: 12px;
 			margin-bottom: 6px;
 		}
-
-		&:last-child {
-			border-bottom: none;
-		}
 	}
 }
 
@@ -39,3 +39,7 @@
 		color: $wp-text;
 	}
 }
+
+.edd-variable-prices__default input:checked {
+	opacity: .5;
+}

assets/css/admin/downloads/_repeatable_row.scss

@@ -1,3 +1,16 @@
+.edd-repeatables-wrap {
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
+}
+
+.edd_repeatable_row {
+	border: 1px solid $wp-border;
+	border-radius: 3px;
+	margin: 0;
+	padding: 0;
+}
+
 .edd_repeatable_row.ui-sortable-placeholder {
 	line-height: 0;
 	padding: 0;
@@ -20,11 +33,6 @@
 	width: 100%;
 }
 
-.edd_variable_prices_wrapper:not(:first-child),
-.edd_repeatable_upload_wrapper:not(:first-child) {
-	margin-top: 12px;
-}
-
 .edd_repeatable_row.ui-sortable-helper .edd-repeatable-row-actions .edd-remove-row {
 	display: none;
 }
@@ -39,17 +47,14 @@
 	}
 }
 
-.edd-repeatable-row-header,
-.edd-bundle-products-header {
+.edd-repeatable-row-header {
 	clear: both;
 	background: $wp-gray-0;
-	border: 1px solid $wp-border;
+	border-bottom: 1px solid $wp-border;
 	display: flex;
 	justify-content: space-between;
-}
-
-.edd-repeatable-row-header {
-	cursor: move;
+	align-items: center;
+	padding: 0 8px;
 }
 
 .edd_repeatable_row:hover .edd-repeatable-row-header,
@@ -70,21 +75,21 @@
 	clear: both;
 }
 
-.edd-repeatable-row-title,
 .edd-bundle-products-header {
-	font-weight: 600;
+	margin-top: 0;
 }
 
-.edd-repeatable-row-title,
-.edd-repeatable-row-actions,
-.edd-bundle-products-header {
-	padding: 8px;
-	box-sizing: border-box;
+.edd-repeatable-row-title {
+	font-weight: 600;
+	padding: 9px 0;
+	margin-right: auto;
 }
 
 .edd-repeatable-row-actions {
-	flex-grow: 1;
-	text-align: right;
+	display: flex;
+	margin-left: auto;
+	align-items: center;
+	gap: 8px;
 }
 
 .edd-repeatable-row-actions .edd-remove-row,
@@ -96,23 +101,18 @@
 .edd-repeatable-row-standard-fields,
 .edd-bundled-product-row {
 	padding: 8px;
-	border-width: 0 1px 1px;
-	border-style: solid;
-	border-color: $wp-border;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	gap: 18px;
-}
 
-/* @todo: remove these when .edd-form-row has been fully implemented */
-.edd-repeatable-row-standard-fields .edd-form-group,
-.edd-bundled-product-row .edd-form-group {
-	margin-bottom: 0;
-	display: inline-flex;
-	flex-direction: column;
-	flex-grow: 1;
-	justify-content: space-between;
+	.edd-form-group {
+		margin-bottom: 0;
+		display: inline-flex;
+		flex-direction: column;
+		flex-grow: 1;
+		justify-content: space-between;
+	}
 }
 
 .edd-repeatable-row-setting-label .edd-help-tip {
@@ -154,7 +154,6 @@
 
 @media screen and (max-width: $break-mobile) {
 
-	.edd-bundle-products-header,
 	.edd-repeatable-row-header,
 	.edd-repeatable-row-standard-fields,
 	.edd-bundled-product-row {

assets/css/admin/downloads/_sections.scss

@@ -0,0 +1,86 @@
+.edd-download-editor__sections {
+	margin-top: 20px;
+
+	.section-content--is-dynamic {
+		position: relative;
+	}
+
+	.section-wrap .edd-section-content__fields--standard .edd-form-group {
+		margin-bottom: 16px;
+	}
+
+	.section-content .inside {
+		margin: 0 !important;
+		padding: 0;
+	}
+}
+
+.section-title--is-dynamic {
+	&:hover,
+	&:focus {
+		.edd-section-title__handle-actions:not(.edd-hidden) {
+			opacity: 1;
+			z-index: 1000;
+		}
+	}
+
+	// This CSS is added specifically to help with keyboard navigation accessibility.
+	.edd-section-title__handle-actions:not(.edd-hidden) {
+		&:focus-within {
+			opacity: 1;
+			z-index: 1000;
+		}
+	}
+}
+
+.edd-section-title__handle-actions.edd__handle-actions-order {
+	position: absolute;
+	right: -44px;
+	display: flex;
+	opacity: 0;
+	transition: opacity 0.25s ease-in-out;
+	z-index: -1;
+
+	button {
+		padding: 9px;
+		border: 1px solid $gray-200;
+		background-color: #fcfcfc;
+
+		&:first-of-type {
+			border-right: 0;
+			border-left: 0;
+		}
+
+		&:last-of-type {
+			border-left: 0;
+			border-top-right-radius: 4px;
+			border-bottom-right-radius: 4px;
+		}
+
+		&:disabled .dashicons {
+			opacity: 0.5;
+		}
+
+		&:focus-visible {
+			outline: none;
+			box-shadow: inset 0 0 1px 1px var(--wp-admin-theme-color);
+		}
+	}
+
+	@media only screen and (max-width: $break-medium) {
+		right: 0;
+		left: 100%;
+	}
+}
+
+body:not(.block-editor-page) {
+	#edd_product_details .inside {
+		margin: 0;
+		padding: 0;
+	}
+
+	.edd-download-editor__sections {
+		border: none;
+		margin-top: 0;
+	}
+}

assets/css/admin/downloads/_settings.scss

@@ -0,0 +1,6 @@
+.edd-buy-buttons {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 8px;
+	margin-bottom: 20px;
+}

assets/css/admin/downloads/style.scss

@@ -1,7 +1,9 @@
 @import "../variables/variables";
 @import "prices";
-@import "product_settings";
 @import "repeatable_row";
 @import "upload";
 @import "duplicate";
 @import "product-files";
+@import "sections";
+@import "settings";
+@import "actions";

assets/css/admin/forms/_form-group.scss

@@ -79,6 +79,7 @@
 
 		+label {
 			display: unset;
+			font-weight: unset;
 		}
 	}
 }

assets/css/admin/forms/_general.scss

@@ -0,0 +1,5 @@
+@media screen and (max-width: $break-mobile) {
+	.regular-text {
+		width: 100%;
+	}
+}

assets/css/admin/forms/style.scss

@@ -1,2 +1,3 @@
 @import "form-group";
 @import "form-row";
+@import "general";

assets/css/admin/general/_elements.scss

@@ -1,5 +1,9 @@
 .edd-hidden {
 	display: none;
+
+	&--required {
+		display: none !important;
+	}
 }
 
 .edd-clearfix:after {

assets/css/admin/general/_grid.scss

@@ -0,0 +1,46 @@
+.edd-admin--has-grid {
+	display: grid;
+	display: -ms-grid;
+	grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+	grid-gap: 20px;
+
+	.postbox {
+		margin-bottom: 0;
+	}
+
+	.edd-from-to-wrapper {
+		display: flex;
+		margin-bottom: 16px;
+		width: 100%;
+
+		input {
+			width: 100%;
+		}
+
+		span {
+			flex-grow: 1;
+		}
+	}
+
+	form {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		position: relative;
+	}
+
+	.postbox .edd-select {
+		max-width: 100%;
+		margin-right: 0;
+	}
+
+	.button.updating-message:before,
+	.button.updated-message:before {
+		vertical-align: text-bottom;
+		margin: 0 5px 0 0;
+	}
+
+	@media screen and (max-width: $break-mobile) {
+		grid-template-columns: 1fr;
+	}
+}