Merge branch 'release/2.1' into feature/gutenberg-donation-form-block

* release/2.1: (103 commits) doc(version-update): bump version to 2.0.4 on branch fix(gulp): ignore some directories when run textdomain comman Wrong text domain doc(pot): ran gulp POT for release 2.0.3 fix(db-update): perform update pause even if batch empty doc(readme): add "give" and "givewp" as tags to readme doc(release): ran pre-release gulp doc(release-changelog): remove line break and dupe entries doc(release): added change log, ran gulp, new POT file for release 2.0.3 fix(chosen-style): remove bubble button look from chosen dropdowns in 2.0.3 fix(float-labels-style): improve theme compatiblity by only targetting fl-label inputs #2340 fix(i18n-string): use date_i18n() rather than date() for localization doc(release): prepare changelog and bump version for 2.0.3 release fix(doc-link): open doc link in new window fix(setting): use div to wrap setting field instead p fix(emails): update email message setting field desc fix(form): add data attribute to manage donate button label fix(email): replace only first occurrence of meta type fix(email): remove error_log style(email): update function desc ...
impress-org · Feb 15, 2018 · 8b991d0 · 8b991d0
2 parents 24043d3 + 96c0c77
commit 8b991d0
Show file tree

Hide file tree

Showing 38 changed files with 1,519 additions and 272 deletions.
diff --git a/assets/css/chosen.css b/assets/css/chosen.css
diff --git a/assets/src/css/admin/forms.scss b/assets/src/css/admin/forms.scss
@@ -763,6 +763,14 @@ ASIDE
 	}
 }
 
+/*-------------------------------------
+Chosen Overrides
+-------------------------------------*/
+
+.chosen-container-single a.chosen-single {
+  background: #FFF !important;
+}
+
 /*-------------------------------------
 Doc Links
 -------------------------------------*/

diff --git a/assets/src/css/admin/importer.scss b/assets/src/css/admin/importer.scss
@@ -9,78 +9,113 @@
 */
 
 .give-tools-setting-page-import {
-  h1.handle {
-	padding: 15px 0 0;
-  }
-  .give-progress-steps {
-	width: 100%;
-	padding: 0 0 24px;
-	margin-left: 0;
-	list-style: none outside;
-	overflow: hidden;
-	display: -webkit-inline-flex;
-	display: -ms-inline-flexbox;
-	display: inline-flex;
-	li {
-	  width: 25%;
-	  float: left;
-	  padding: 0 0 1.2em;
-	  margin: 0;
-	  text-align: center;
-	  position: relative;
-	  border-bottom: 4px solid #ccc;
-	  line-height: 1.4em;
+	h1.handle {
+		padding: 15px 0 0;
 	}
+	.give-progress-steps {
+		width: 100%;
+		padding: 0 0 24px;
+		margin-left: 0;
+		list-style: none outside;
+		overflow: hidden;
+		display: -webkit-inline-flex;
+		display: -ms-inline-flexbox;
+		display: inline-flex;
+		li {
+			width: 25%;
+			float: left;
+			padding: 0 0 1.2em;
+			margin: 0;
+			text-align: center;
+			position: relative;
+			border-bottom: 4px solid #ccc;
+			line-height: 1.4em;
+		}
 
-	li.active {
-	  border-color: #4ead61;
-	  color: #4ead61;
+		li.active {
+			border-color: #4ead61;
+			color: #4ead61;
 
-	  &:before {
-		border-color: #4ead61;
-		color: #4ead61;
-		background: #4ead61;
-	  }
+			&:before {
+				border-color: #4ead61;
+				color: #4ead61;
+				background: #4ead61;
+			}
+		}
+
+		li::before {
+			content: '';
+			border: 4px solid #ccc;
+			border-radius: 100%;
+			width: 10px;
+			height: 10px;
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			margin-left: -6px;
+			margin-bottom: -10px;
+			background: #fff;
+		}
 	}
 
-	li::before {
-	  content: '';
-	  border: 4px solid #ccc;
-	  border-radius: 100%;
-	  width: 10px;
-	  height: 10px;
-	  position: absolute;
-	  bottom: 0;
-	  left: 50%;
-	  margin-left: -6px;
-	  margin-bottom: -10px;
-	  background: #fff;
+	.step-4 {
+		h2 {
+			text-align: center;
+			font-size: 20px !important;
+		}
+		p {
+			text-align: center;
+		}
 	}
-  }
 
-  .step-4 {
-	h2 {
-	  text-align: center;
-	  font-size: 20px !important;
+	.button-secondary.step-4, .give-image-thumb {
+		display: none;
 	}
-	p {
-	  text-align: center;
+
+	h2#give-import-title {
+		background: #f3f3f3;
+		font-size: 15px;
+		font-weight: 600;
+		margin: -8px -22px 11px;
+		padding: 12px 22px;
 	}
-  }
-
-  .button-secondary.step-4, .give-image-thumb {
-	display: none;
-  }
-
-  h2#give-import-title {
-	background: #f3f3f3;
-	font-size: 15px;
-	font-weight: 600;
-	margin: -8px -22px 11px;
-	padding: 12px 22px;
-  }
-}
 
+	table.step-2 {
+
+		h2#give-import-title {
+			font-size: small;
+			font-weight: inherit;
+		}
+
+		.give-import-donation-required-fields-title {
+			font-size: 18px;
+			font-weight: 600;
+			margin: 0px;
+		}
+
+		.give-import-donation-required-fields {
+			white-space:nowrap;
+			overflow:hidden;
+
+			li {
+				display:inline-block;
+				margin: 0 10% 0 0;
+
+				span.give-import-donation-required-symbol {
+					border-radius: 1em;
+					vertical-align: middle;
+					padding: 2px;
+					background: #46b450;
+					color: white;
+				}
+
+				span.dashicons-no-alt {
+					background: #bbbbbb;
+				}
+			}
+		}
+	}
+}
 
 .give-import-core-settings {
 	.give-progress-steps {
@@ -101,10 +136,10 @@
 }
 
 form.give-import-form table.widefat {
-  border:none;
+	border: none;
 }
 
 .wrap .give-importer-h1 {
-  margin: 0;
-  padding: 20px 0;
+	margin: 0;
+	padding: 20px 0;
 }
diff --git a/assets/src/css/admin/settings.scss b/assets/src/css/admin/settings.scss
@@ -125,7 +125,9 @@
   margin: 5px 0 0 !important;
 }
 
-p.give-field-description, .cmb2-metabox-description {
+p.give-field-description,
+div.give-field-description,
+.cmb2-metabox-description {
   color: #aaaaaa;
   font-style: italic;
   font-size: 13px !important;

diff --git a/assets/src/css/frontend/float-labels.scss b/assets/src/css/frontend/float-labels.scss
@@ -1,14 +1,29 @@
 #{fl(parent)}.#{fl(prefix)}form.#{fl(prefix)}style-give {
+
   input.#{fl(prefix)}input,
   select.#{fl(prefix)}select,
   textarea.#{fl(prefix)}textarea {
 	line-height: inherit;
 	padding: 12px;
 	background-color: #FFF;
   }
+
+  input.#{fl(prefix)}input[type="text"],
+  input.#{fl(prefix)}input[type="email"],
+  input.#{fl(prefix)}input[type="password"],
+  input.#{fl(prefix)}input[type="search"],
+  input.#{fl(prefix)}input[type="email"],
+  input.#{fl(prefix)}input[type="tel"],
+  input.#{fl(prefix)}input[type="url"],
+  input.#{fl(prefix)}input[type="number"] {
+	height: auto;
+	min-height: 50px;
+  }
+
   select.#{fl(prefix)}select {
 	line-height: inherit;
   }
+
   .#{fl(prefix)}is-active input.#{fl(prefix)}input,
   .#{fl(prefix)}is-active select.#{fl(prefix)}select,
   .#{fl(prefix)}is-active textarea.#{fl(prefix)}textarea {