Version bump to 1.9.0

Squashed with following commits : commit 3f57b07 (HEAD -> develop, origin/develop) Author: Nilan Bhasima <[email protected]> Date: Tue Nov 17 16:48:47 2020 +0545 Refactor - Admin popup UI (#286) * Add - Styles for new template setup * Add - ur_parse_args() for multi-dimensional array * Send Email with email template selected in specific registration form * Tweak - label inline in the table * Email contents overrider settings add and update * Override email content before sending email * Tweaks on components * Tweak - {{all_fields}} smart tags paesed into a table format * Tweak - Template UI * Button UI * Fix - Form preview * Template setup UI * Tweak - hover on blank template * Fix - Use default format when no email templated selected * Tweak - Upgrade to premium modal popup UI * Refactor - Delete confirm popup * Refactor - Popup UI in builder * Tweak - Input text styles for swal popup * Added variation to the list group * Tweaks on components * Tweaks - Table elements Co-authored-by: Prajjwal Poudel <[email protected]> commit 410a01d Author: Krishna Suwal <[email protected]> Date: Tue Nov 10 21:56:37 2020 +0545 Fix - Conditional logic not working in WooCommerce checkout page (#275) * Fix - Conditional logic not working in woocommerce checkout page * Fix - Conditional logic not working in woocommerce checkout page * some fixes Co-authored-by: Lekhnath Pandey <[email protected]> commit 8ed70ce Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 10:14:08 2020 +0545 Feature - Email content override for Email Templates addon. (#276) * Add - Styles for new template setup * Add - ur_parse_args() for multi-dimensional array * Send Email with email template selected in specific registration form * Tweak - label inline in the table * Email contents overrider settings add and update * Override email content before sending email * Tweaks on components * Tweak - {{all_fields}} smart tags paesed into a table format * Tweak - Template UI * Button UI * Fix - Form preview * Template setup UI * Tweak - hover on blank template * Fix - Use default format when no email templated selected Co-authored-by: Nilan Bhasima <[email protected]> commit f2b7db5 Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 10:03:13 2020 +0545 Enhance- Re-initialize form after full page load (#281) * Re-initialization of form after full page load * Tweak - Z-index stack order for popup * Merge conflict resolved Co-authored-by: Nilan Bhasima <[email protected]> commit ea085ac Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 09:55:17 2020 +0545 Tweak - JS format changed commit ff13a6c Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 09:14:32 2020 +0545 Enhance - Max upload size and valid file type settings value save and retrieve (#279) * Tweak - Max upload size value parse * Tweak - Selec2 initializtaion for valid file type setting * Tweak - Valid file type value parse * Add - Max upload size and valid file type option parse in edit profile commit a7b57b4 Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 09:13:39 2020 +0545 Tweak - Number field max, min and step validation message override and made translatable (#280) commit d8543ef Author: Prajjwal Poudel <[email protected]> Date: Tue Nov 10 09:12:41 2020 +0545 Tweak - Hide unrelated admin notices from settings page (#282) * Handled separate filters for notices in different UR pages * Tweak - Display only user registration and addons notices in UR settings page * Tweak - Renamed notices in order to display in UR settings page commit 15c130a Author: Lekhnath Pandey <[email protected]> Date: Tue Nov 10 09:12:09 2020 +0545 Dev - Zapier addon compatibility. (#283) * Add - Function to get particular user data format * Fix - Billing and shipping data format commit 4b7e856 Author: Krishna Suwal <[email protected]> Date: Tue Nov 10 09:11:40 2020 +0545 Fix - Conditional Logic required fields conflict (#284) commit 698a213 Author: Krishna Suwal <[email protected]> Date: Tue Nov 10 09:08:58 2020 +0545 Fix - Conditional Logic in my account (#285) commit 7ab5316 Author: Nilan Bhasima <[email protected]> Date: Thu Nov 5 14:36:57 2020 +0545 Fix - Grid layout design issue in extention page
wpeverest · Nov 18, 2020 · e48c0e0 · e48c0e0
1 parent 073ddb8
commit e48c0e0
Show file tree

Hide file tree

Showing 40 changed files with 4,866 additions and 2,364 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,17 @@
+= 1.9.0 - 18/11/2020
+* Feature - Email content override for Email Templates addon.
+* Enhance- Re-initialize form after full page load.
+* Enhance - Max upload size and valid file type settings value save and retrieve.
+* Dev - Zapier add-on compatibility.
+* Refactor - Admin popup UI.
+* Tweak - JS format changed.
+* Tweak - Hide unrelated admin notices from the settings page.
+* Tweak - Number field max, min, and step validation message override and made translatable.
+* Fix - Conditional logic not working in the WooCommerce checkout page.
+* Fix - Conditional Logic required fields conflict.
+* Fix - Conditional Logic in my account.
+* Fix - Grid layout design issue in the extension page.
+
 = 1.8.8 - 13/10/2020
 * Enhance - Hide signup link on login if users_can_register option is not enabled.
 * Fix - Number fields step option not working.

diff --git a/assets/css/_fonts.scss b/assets/css/_fonts.scss
@@ -20,6 +20,10 @@
 	text-align: center;
 }
 
+.ur-text-right {
+	text-align: right;
+}
+
 .ur-text-muted {
 	color: $color_gray_three;
 }

diff --git a/assets/css/_forms.scss b/assets/css/_forms.scss
@@ -185,7 +185,7 @@
 	}
 
 	label {
-		margin: 0 0 0 8px;
+		margin: 0 0 0 8px !important;
 	}
 }
 

diff --git a/assets/css/_overlay.scss b/assets/css/_overlay.scss
@@ -0,0 +1,31 @@
+.user-registration-overlay {
+	background-color: transparentize($gray-base, 0.7);
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	z-index: 1;
+
+	&.is-fixed {
+		position: fixed;
+	}
+
+	#wpcontent & {
+		margin-left: -20px;
+	}
+
+	.ur-spinner {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		margin: 0 auto;
+
+		&::before {
+			width: 20px;
+			height: 20px;
+		}
+	}
+}
diff --git a/assets/css/_tables.scss b/assets/css/_tables.scss
@@ -1,14 +1,46 @@
-table.user-registration-table {
+.user-registration-table {
 	width: 100%;
 	background: $white;
 	border-collapse: collapse;
 
+	&__column-md {
+		width: 40%;
+	}
+
+	&__column-sm {
+		width: 20%;
+	}
+
+	&__column-auto {
+		width: 1%;
+		white-space: nowrap;
+	}
+
+	&__img {
+		height: 40px;
+		width: 40px;
+		border-radius: 4px;
+		overflow: hidden;
+	}
+
 	caption,
 	th,
 	td {
-		padding: 1rem;
+		padding: 1rem 0.5rem;
 		text-align: left;
 		border-bottom: 1px solid $border_color;
+
+		&:first-child {
+			padding-left: 1rem;
+		}
+
+		&:last-child {
+			padding-right: 1rem;
+		}
+	}
+
+	td {
+		vertical-align: top;
 	}
 
 	caption,

diff --git a/assets/css/admin-rtl.css b/assets/css/admin-rtl.css
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
@@ -24,11 +24,14 @@
 @import "border";
 @import "spacing";
 @import "grids";
+@import "overlay";
 
 // Layout-related sections
 @import
 'layout/header';
 
+@import 'templates/template-setup';
+
 
 /**
  * Styling begins
@@ -119,20 +122,38 @@
  * Addons page
  **/
 .ur_addons_wrap {
+	*,
+	::before,
+	::after {
+		box-sizing: border-box;
+	}
+
 	.products {
-		overflow: hidden;
 		display: flex;
 		flex-wrap: wrap;
+		margin-left: -12px;
+		margin-right: -12px;
 
 		li {
-			margin: 0 1% 1% 0 !important;
-			padding: 0;
-			vertical-align: top;
-			width: 19.2%;
-			float: left;
+			width: 20%;
+			padding: 0 12px;
+			flex: 0 0 20%;
+			margin-bottom: 24px;
+
+			@media only screen and (max-width: 1599px) {
+				width: 33.333%;
+				flex: 0 0 33.333%;
+			}
 
-			&:nth-child(5n) {
-				margin: 0 0 1% 0!important;
+			@media only screen and (max-width: 768px) {
+				width: 50%;
+				flex: 0 0 50%;
+			}
+
+			@media only screen and (max-width: 480px) {
+				width: 100%;
+				flex: 0 0 100%;
+				margin-bottom: 12px;
 			}
 
 			a {
@@ -478,41 +499,6 @@
 	}
 }
 
-/**
- * Sweet Alert styling
- **/
-.user-registration_page_add-new-registration {
-	.swal2-container {
-		.swal2-title {
-			color: $gray_base;
-			font-size: 24px;
-			flex-wrap: wrap;
-			margin-bottom: 24px;
-		}
-
-		.dashicons {
-			color: $red;
-			font-size: 28px;
-			width: 56px;
-			height: 56px;
-			line-height: 56px;
-			margin: 0 auto 20px;
-			border: 2px solid $red;
-			border-radius: 50%;
-		}
-
-		.ur-swal-title {
-			flex: 100%;
-		}
-
-		.swal2-content,
-		p {
-			color: $color_gray_one;
-			font-size: 1em;
-		}
-	}
-}
-
 .user-registration {
 	nav.ur-nav-tab-wrapper {
 		margin: 1.5em 0 1em;
@@ -564,6 +550,10 @@
 			position: relative;
 			padding-right: 24px;
 
+			label {
+				display: inline-block;
+			}
+
 			img.help_tip,
 			.user-registration-help-tip {
 				margin: 0 -24px 0 0;
@@ -1067,6 +1057,7 @@
 					height: auto;
 					width: auto;
 					cursor: pointer;
+					margin: 0;
 					padding: 4px 6px;
 					line-height: 1;
 					transition: all 0.1s ease-in-out;
@@ -2009,27 +2000,6 @@ body {
 	}
 }
 
-/**
- * Media Queries
- */
-@media only screen and (max-width: 1599px) {
-	.ur_addons_wrap {
-		.products {
-			li {
-				width: 32.66%;
-
-				&:nth-child(3n) {
-					margin: 0 0 1% 0 !important;
-				}
-
-				&:nth-child(5n) {
-					margin: 0 1% 1% 0 !important;
-				}
-			}
-		}
-	}
-}
-
 @media screen and (max-width: 1400px) {
 	.ur-registered-from {
 		.urcl-rules {
@@ -2057,26 +2027,6 @@ body {
 	}
 }
 
-@media only screen and (max-width: 1120px) {
-	.ur_addons_wrap {
-		.products {
-			li {
-				width: 49%;
-				margin: 0 2% 2% 0 !important;
-
-				&:nth-child(2n) {
-					margin: 0 0 2% 0 !important;
-				}
-
-				&:nth-child(3n),
-				&:nth-child(5n) {
-					margin: 0 2% 2% 0 !important;
-				}
-			}
-		}
-	}
-}
-
 @media screen and (max-width: 960px) {
 	.ur-registered-from {
 		.ur-registered-inputs {
@@ -2093,16 +2043,6 @@ body {
 	}
 }
 
-@media only screen and (max-width: 900px) {
-	.ur_addons_wrap {
-		.products {
-			li {
-				width: 49%;
-			}
-		}
-	}
-}
-
 @media screen and (max-width: 782px) {
 	body.user-registration_page_add-new-registration {
 		min-width: 0 !important;
@@ -2163,13 +2103,3 @@ body {
 		}
 	}
 }
-
-@media only screen and (max-width: 480px) {
-	.ur_addons_wrap .products li,
-	.ur_addons_wrap .products li:nth-child(5n),
-	.ur_addons_wrap .products li:nth-child(3n),
-	.ur_addons_wrap .products li:nth-child(2n) {
-		width: 100%;
-		margin: 0 0 3% 0 !important;
-	}
-}
diff --git a/assets/css/components/_button.scss b/assets/css/components/_button.scss
@@ -5,6 +5,11 @@
 		transition: all 0.25s ease 0s;
 		box-shadow: 0 1px 3px transparentize($color_gray_three, 0.85);
 
+		+ button,
+		+ .button {
+			margin-left: 6px;
+		}
+
 		&.button-icon {
 			width: 32px;
 			padding: 0;
@@ -14,6 +19,11 @@
 				line-height: 0.9;
 				vertical-align: middle;
 			}
+
+			svg {
+				display: block;
+				margin: 0 auto;
+			}
 		}
 
 		&.button-icon-round {
@@ -109,14 +119,14 @@
 		}
 	}
 
-	.publishing-action {
-		button,
-		input[type='button'],
-		input[type='submit'],
-		.button {
-			margin-right: 5px;
-		}
-	}
+	// .publishing-action {
+	// 	button,
+	// 	input[type='button'],
+	// 	input[type='submit'],
+	// 	.button {
+	// 		margin-right: 5px;
+	// 	}
+	// }
 }
 
 .user-registration-button-group {