jenkins-bot has submitted this change and it was merged.
Change subject: Globalcollect form and iframe content css changes
......................................................................
Globalcollect form and iframe content css changes
Fixes an alignment issue with the iframe and spinner,
makes sure the iframe content background for the controls is
not being overriddn by GC defaulte
Conflicts:
globalcollect_gateway/forms/css/iframe.css
Change-Id: Ibafdee5d81e892019e4c228c2c218d1c9aed6ee8
---
M globalcollect_gateway/forms/css/iframe.css
M globalcollect_gateway/forms/html/cc/cc-a.html
M globalcollect_gateway/forms/html/cc/cc-vm.html
M globalcollect_gateway/forms/html/cc/cc-vma.html
M globalcollect_gateway/forms/html/cc/cc-vmad.html
M globalcollect_gateway/forms/html/cc/cc-vmaj.html
M globalcollect_gateway/forms/html/cc/cc-vmd.html
M globalcollect_gateway/forms/html/cc/cc-vmj.html
M globalcollect_gateway/forms/html/cc/cc.html
M globalcollect_gateway/forms/html/rcc/rcc-vm.html
M globalcollect_gateway/forms/html/rcc/rcc-vma.html
M globalcollect_gateway/forms/html/rcc/rcc-vmad.html
M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
M globalcollect_gateway/forms/html/rcc/rcc-vmd.html
M globalcollect_gateway/forms/html/rcc/rcc-vmj.html
M globalcollect_gateway/forms/html/rcc/rcc.html
M globalcollect_gateway/forms/js/gc.js
17 files changed, 45 insertions(+), 17 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/globalcollect_gateway/forms/css/iframe.css
b/globalcollect_gateway/forms/css/iframe.css
index ac181e9..a080fcf 100644
--- a/globalcollect_gateway/forms/css/iframe.css
+++ b/globalcollect_gateway/forms/css/iframe.css
@@ -69,3 +69,31 @@
/* @noflip */
direction: ltr;
}
+
+input, select {
+ background-color: #f6f6f6 !important;
+ padding: 1em !important;
+ -moz-box-shadow: 0 1px 1px rgba(0,0,0,.2), inset 0 0 0 1px rgba(0,0,0,.1);
+ -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.2), inset 0 0 0 1px
rgba(0,0,0,.1);
+ box-shadow: 0 1px 1px rgba(0,0,0,.2), inset 0 0 0 1px rgba(0,0,0,.1);
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ border: 0 !important;
+ color: #006699;
+ cursor: pointer;
+ margin-bottom: .2em;
+}
+
+input.ORB_SELECT:first-child {
+ margin-right: 2%;
+}
+
+input#btnSubmit {
+ text-transform: uppercase;
+ font-size: 1.3em;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ padding: .6em !important;
+}
diff --git a/globalcollect_gateway/forms/html/cc/cc-a.html
b/globalcollect_gateway/forms/html/cc/cc-a.html
index e3b8e9f..43ae3bf 100644
--- a/globalcollect_gateway/forms/html/cc/cc-a.html
+++ b/globalcollect_gateway/forms/html/cc/cc-a.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vm.html
b/globalcollect_gateway/forms/html/cc/cc-vm.html
index 3a19ba3..f85e588 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vm.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vm.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vma.html
b/globalcollect_gateway/forms/html/cc/cc-vma.html
index d09aa3e..930c245 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vma.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vma.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmad.html
b/globalcollect_gateway/forms/html/cc/cc-vmad.html
index 7909b2f..0ea1442 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmad.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmad.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
index f635010..e10ce93 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmaj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmaj.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmd.html
b/globalcollect_gateway/forms/html/cc/cc-vmd.html
index ec1ed4a..5214594 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmd.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmd.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc-vmj.html
b/globalcollect_gateway/forms/html/cc/cc-vmj.html
index 856259f..80a03c6 100644
--- a/globalcollect_gateway/forms/html/cc/cc-vmj.html
+++ b/globalcollect_gateway/forms/html/cc/cc-vmj.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/cc/cc.html
b/globalcollect_gateway/forms/html/cc/cc.html
index 84abe77..f982ac3 100644
--- a/globalcollect_gateway/forms/html/cc/cc.html
+++ b/globalcollect_gateway/forms/html/cc/cc.html
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
index f8609a2..69653a4 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vm.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vm.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
index 393555b..5cdf6af 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vma.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vma.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
index 635adec..af8cd7d 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
index a26d871..5dc2a4d 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
index bab9588..3146be7 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmd.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
index a0709b5..06dc714 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc-vmj.html
@@ -49,7 +49,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/html/rcc/rcc.html
b/globalcollect_gateway/forms/html/rcc/rcc.html
index da38901..1b870c6 100644
--- a/globalcollect_gateway/forms/html/rcc/rcc.html
+++ b/globalcollect_gateway/forms/html/rcc/rcc.html
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>
- <div id="payment" class="gainlayout"
style="height: 0;text-align: center;"></div>
+ <div id="payment" class="gainlayout"
style="height: 0;text-align: left;"></div>
</td>
</tr>
<tr>
diff --git a/globalcollect_gateway/forms/js/gc.js
b/globalcollect_gateway/forms/js/gc.js
index 26f6237..b29971f 100644
--- a/globalcollect_gateway/forms/js/gc.js
+++ b/globalcollect_gateway/forms/js/gc.js
@@ -1,8 +1,8 @@
window.displayCreditCardForm = function () {
$( '#payment' ).empty();
// Load wait spinner
- $( '#payment' ).append( '<br/><br/><img alt="loading" src="' +
mw.config.get( 'wgScriptPath' ) +
-
'/extensions/DonationInterface/gateway_forms/includes/loading-white.gif" />' );
+ $( '#payment' ).append( '<br/><br/><div style="text-align:center"><img
alt="loading" src="' + mw.config.get( 'wgScriptPath' ) +
+
'/extensions/DonationInterface/gateway_forms/includes/loading-white.gif"
/></div>' );
var currencyField, currency_code, stateField, state, countryField,
country, sendData,
language = 'en'; // default value is English
--
To view, visit https://gerrit.wikimedia.org/r/181181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibafdee5d81e892019e4c228c2c218d1c9aed6ee8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Awight <[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
