Katie Horn has submitted this change and it was merged.
Change subject: Correct bad conflict resolution
......................................................................
Correct bad conflict resolution
Mistake was in commit 91cedc492dc9158b3cb1ee96a0055bbf9a880b67
Change-Id: I1178c15c8b2310455d1f12310a1ff0fe334487ae
---
M globalcollect_gateway/forms/css/gc.css
M globalcollect_gateway/forms/html/_personal-information/CA.html
M globalcollect_gateway/forms/html/_personal-information/US.html
3 files changed, 21 insertions(+), 72 deletions(-)
Approvals:
Katie Horn: Looks good to me, approved
diff --git a/globalcollect_gateway/forms/css/gc.css
b/globalcollect_gateway/forms/css/gc.css
index 63341c7..b9e1200 100644
--- a/globalcollect_gateway/forms/css/gc.css
+++ b/globalcollect_gateway/forms/css/gc.css
@@ -96,25 +96,6 @@
table#payflow-table-donor{
/*margin-left: 10px;*/
}
-/* Specific element overrides */
-input#zip.ja {
- width: 268px;
-}
-select#state.ja {
- width:100%;
-}
-
-select#state.it {
- width: auto;
-}
-
-select#state.au {
- width:109px;
-}
-
-#emailAdd {
- width:137px;
-}
/* From Webitects */
/* Options */
@@ -127,13 +108,6 @@
.options-h li:last-child { margin: 0; }
.form .options-v { margin-top: 5px; }
.options-v li { padding-left: 25px; text-indent: -25px; }
-
-/* From 2014 appeal */
-* {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
input:-moz-placeholder { opacity: 1; }
input::-moz-placeholder { opacity: 1; }
@@ -238,27 +212,6 @@
#payflow-table-donor select { padding: .9em 1em !important; line-height: 40px;
}
-input#city { width: 170px !important; }
-input#zip { width: 98px !important; }
-
-select#state.us,
-select#state.au,
-select#state.ca {
- width: 85px;
-}
-
-select#state.gb {
- width: 100%;
-}
-
-select#country {
- width: 100%;
-}
-
-#payflow-table-donor input.halfwidth { width: 48%; }
-#payflow-table-donor input.halfwidth:first-child { margin-right:2%; }
-
-input.fullwidth { width: 100% !important; }
.mw-donate-submessage {
text-transform: uppercase;
font-size: .75em !important;
diff --git a/globalcollect_gateway/forms/html/_personal-information/CA.html
b/globalcollect_gateway/forms/html/_personal-information/CA.html
index 69f901a..7151893 100644
--- a/globalcollect_gateway/forms/html/_personal-information/CA.html
+++ b/globalcollect_gateway/forms/html/_personal-information/CA.html
@@ -1,25 +1,24 @@
<tr>
- <td colspan="2">
+ <td>
<h3
class="cc_header">%donate_interface-cc-form-header-personal%<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-left:8px;"></h3>
</td>
</tr>
<tr>
- <td colspan="2">
- <input class="halfwidth" name="fname" value="@fname"
type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input
class="halfwidth leftmar" name="lname" value="@lname" type="text"
placeholder="%donate_interface-donor-lname%" id="lname">
+ <td>
+ <input class="halfwidth" name="fname" value="@fname"
type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input
class="halfwidth" name="lname" value="@lname" type="text"
placeholder="%donate_interface-donor-lname%" id="lname">
</td>
</tr>
<tr>
- <td colspan="2"><span class="creditcard-error-msg"></span></td>
+ <td><span class="creditcard-error-msg"></span></td>
</tr>
<tr>
- <td colspan="2">
+ <td>
<input class="fullwidth" name="street" value="@street"
type="text" title="%donate_interface-donor-street%"
placeholder="%donate_interface-donor-street%" id="street">
</td>
</tr>
<tr>
- <td colspan="2">
- <input class="halfwidth state" name="city" value="@city"
type="text" title="%donate_interface-donor-city%"
placeholder="%donate_interface-donor-city%" id="city">
- <select id="state" name="state" class="ca" value="@state" >
+ <td>
+ <input class="thirdwidth" name="city" value="@city" type="text"
title="%donate_interface-donor-city%"
placeholder="%donate_interface-donor-city%" id="city"><select id="state"
name="state" class="ca thirdwidth" value="@state" >
<option value="" disabled
selected>%donate_interface-donor-province%</option>
<option value="AB">AB</option>
<option value="BC">BC</option>
@@ -34,22 +33,21 @@
<option value="QC">QC</option>
<option value="SK">SK</option>
<option value="YT">YT</option>
- </select>
- <input name="zip" class="halfwidth leftmar state" value="@zip"
type="text" title="%donate_interface-postal%"
placeholder="%donate_interface-donor-postal%" id="zip">
+ </select><input name="zip" class="thirdwidth state"
value="@zip" type="text" title="%donate_interface-postal%"
placeholder="%donate_interface-donor-postal%" id="zip">
</td>
</tr>
<tr style="display: none;">
- <td colspan="2">
+ <td>
<input type="hidden" value="CA" name="country" id="country" />
</td>
</tr>
<tr>
- <td colspan="2">
+ <td>
</td>
</tr>
<tr>
- <td colspan="2">
+ <td>
<input class="fullwidth" name="emailAdd" value="@emailAdd"
type="email" title="%donate_interface-donor-email%"
placeholder="%donate_interface-donor-email%" id="emailAdd">
</td>
</tr>
diff --git a/globalcollect_gateway/forms/html/_personal-information/US.html
b/globalcollect_gateway/forms/html/_personal-information/US.html
index 79bd570..30cf794 100644
--- a/globalcollect_gateway/forms/html/_personal-information/US.html
+++ b/globalcollect_gateway/forms/html/_personal-information/US.html
@@ -1,25 +1,24 @@
<tr>
- <td colspan="2">
+ <td>
<h3
class="cc_header">%donate_interface-cc-form-header-personal%<img
src="@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif"
style="vertical-align:baseline;margin-left:8px;"></h3>
</td>
</tr>
<tr>
- <td colspan="2">
- <input class="halfwidth" name="fname" value="@fname"
type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input
class="halfwidth leftmar" name="lname" value="@lname" type="text"
placeholder="%donate_interface-donor-lname%" id="lname">
+ <td>
+ <input class="halfwidth" name="fname" value="@fname"
type="text" placeholder="%donate_interface-donor-fname%" id="fname"><input
class="halfwidth" name="lname" value="@lname" type="text"
placeholder="%donate_interface-donor-lname%" id="lname">
</td>
</tr>
<tr>
- <td colspan="2"><span class="creditcard-error-msg"></span></td>
+ <td><span class="creditcard-error-msg"></span></td>
</tr>
<tr>
- <td colspan="2">
+ <td>
<input class="fullwidth" name="street" value="@street"
type="text" title="%donate_interface-donor-street%"
placeholder="%donate_interface-donor-street%" id="street">
</td>
</tr>
<tr>
- <td colspan="2" style="white-space: nowrap;">
- <input class="halfwidth state" name="city" value="@city"
type="text" title="%donate_interface-donor-city%"
placeholder="%donate_interface-donor-city%" id="city">
- <select id="state" name="state" class="us" value="@state" >
+ <td>
+ <input class="thirdwidth" name="city" value="@city" type="text"
title="%donate_interface-donor-city%"
placeholder="%donate_interface-donor-city%" id="city"><select id="state"
name="state" class="us thirdwidth" value="@state" >
<option value="" disabled
selected>%donate_interface-donor-state%</option>
<option value="AK">AK</option>
<option value="AL">AL</option>
@@ -76,17 +75,16 @@
<option value="AA">AA</option>
<option value="AE">AE</option>
<option value="AP">AP</option>
- </select>
- <input name="zip" class="halfwidth leftmar state" value="@zip"
type="text" title="%donate_interface-postal%"
placeholder="%donate_interface-donor-postal%" id="zip" pattern="\d*">
+ </select><input class="thirdwidth" name="zip" value="@zip"
type="text" title="%donate_interface-postal%"
placeholder="%donate_interface-donor-postal%" id="zip" pattern="\d*">
</td>
</tr>
<tr style="display: none;">
- <td colspan="2">
+ <td>
<input type="hidden" value="US" name="country" id="country" />
</td>
</tr>
<tr>
- <td colspan="2">
+ <td>
<input class="fullwidth" name="emailAdd" value="@emailAdd"
type="email" title="%donate_interface-donor-email%"
placeholder="%donate_interface-donor-email%" id="emailAdd">
</td>
</tr>
--
To view, visit https://gerrit.wikimedia.org/r/182331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1178c15c8b2310455d1f12310a1ff0fe334487ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
