Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #97 from wacii/update-client-assets

update client to 2.8.0 and drop-in to 1.6.0
  • Loading branch information...
commit 5cd659448d29d888ef12065894b93bdb61ac08d8 2 parents 530502c + b3a2312
@birarda birarda authored
View
4 asset_versions.yml
@@ -1,3 +1,3 @@
---
-client_version: 2.7.2
-dropin_version: 1.4.0
+client_version: 2.8.0
+dropin_version: 1.6.0
View
12 lib/fake_braintree/braintree_assets/dropin/1.4.0/braintree-dropin-internal.min.js
0 additions, 12 deletions not shown
View
12 lib/fake_braintree/braintree_assets/dropin/1.6.0/braintree-dropin-internal.min.js
12 additions, 0 deletions not shown
View
53 ..._assets/dropin/1.4.0/braintree-dropin.css → ..._assets/dropin/1.6.0/braintree-dropin.css
@@ -83,13 +83,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 0;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.coinbase {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 0;
height: 28px;
width: 44px;
@@ -101,13 +101,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -72px;
height: 29px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.paypal {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -212px;
height: 29px;
width: 44px;
@@ -119,13 +119,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -231px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.visa {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -184px;
height: 28px;
width: 44px;
@@ -137,13 +137,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -203px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.master-card {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -128px;
height: 28px;
width: 44px;
@@ -155,13 +155,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -119px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.american-express {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -72px;
height: 28px;
width: 44px;
@@ -173,13 +173,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -259px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.diners-club {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -259px;
height: 28px;
width: 44px;
@@ -191,13 +191,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -287px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.discover {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -287px;
height: 28px;
width: 44px;
@@ -209,13 +209,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -175px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.payment-method-icon.jcb {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -100px;
height: 28px;
width: 44px;
@@ -231,13 +231,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -343px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.cvv-label .payment-method-icon#cvv-icon {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -343px;
height: 28px;
width: 44px;
@@ -249,13 +249,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -315px;
height: 28px;
width: 44px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.cvv-label .payment-method-icon#cid-icon {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -315px;
height: 28px;
width: 44px;
@@ -1984,14 +1984,14 @@ button#coinbase-container {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -421px;
height: 16px;
width: 79px;
margin: 0 auto; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
button#coinbase-container .coinbase-button-logo {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -421px;
height: 16px;
width: 79px;
@@ -2041,7 +2041,7 @@ button.paypal {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -399px;
height: 22px;
width: 61px;
@@ -2049,7 +2049,7 @@ button.paypal {
margin: 8px auto 0; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
button.paypal .paypal-button-logo {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -371px;
height: 22px;
width: 61px;
@@ -4165,6 +4165,7 @@ button.paypal {
* Server error
*/
.server-error {
+ background: #fff;
background: rgba(255, 255, 255, 0.85);
position: absolute;
left: 0;
@@ -4203,7 +4204,7 @@ button.paypal {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
- background-image: url('/dropin/1.4.0/images/1x-s0fcd0a14c6.png');
+ background-image: url('/dropin/1.6.0/images/1x-s0fcd0a14c6.png');
background-position: 0 -101px;
height: 18px;
width: 18px;
@@ -4212,7 +4213,7 @@ button.paypal {
margin-bottom: -2px; }
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-resolution: 240dpi) {
.server-error .error-icon {
- background-image: url('/dropin/1.4.0/images/2x-sf9a66b4f5a.png');
+ background-image: url('/dropin/1.6.0/images/2x-sf9a66b4f5a.png');
background-position: 0 -241px;
height: 18px;
width: 18px;
View
0  ...ts/dropin/1.4.0/images/2x-sf9a66b4f5a.png → ...ts/dropin/1.6.0/images/2x-sf9a66b4f5a.png
File renamed without changes
View
12 ...ree_assets/dropin/1.4.0/inline-frame.html → ...ree_assets/dropin/1.6.0/inline-frame.html
@@ -5,9 +5,9 @@
<head>
<title>Cards</title>
<meta charset="UTF-8">
- <link href="/dropin/1.4.0/vendor/normalize.css" rel="stylesheet">
- <link href="/dropin/1.4.0/braintree-dropin.css" rel="stylesheet">
- <script src="/dropin/1.4.0/vendor/modernizr.js"></script>
+ <link href="/dropin/1.6.0/vendor/normalize.css" rel="stylesheet">
+ <link href="/dropin/1.6.0/braintree-dropin.css" rel="stylesheet">
+ <script src="/dropin/1.6.0/vendor/modernizr.js"></script>
</head>
<body class="inline-frame is-loading initial-inline-frame-loading">
<div id="container">
@@ -35,9 +35,9 @@
<button class="cancel-popup-button">Cancel PayPal Login</button>
</div>
- <!--[if LT IE 9]><script src="/dropin/1.4.0/vendor/jquery-1.11.0.js"></script><![endif]-->
- <!--[if gte IE 9]><!--><script src="/dropin/1.4.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
- <script src="/dropin/1.4.0/braintree-dropin-internal.min.js"></script>
+ <!--[if LT IE 9]><script src="/dropin/1.6.0/vendor/jquery-1.11.0.js"></script><![endif]-->
+ <!--[if gte IE 9]><!--><script src="/dropin/1.6.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
+ <script src="/dropin/1.6.0/braintree-dropin-internal.min.js"></script>
<script>
var inlineFrame = new braintree.dropin.InlineFrame.Manager({
container: document.getElementById("container")
View
12 ...tree_assets/dropin/1.4.0/modal-frame.html → ...tree_assets/dropin/1.6.0/modal-frame.html
@@ -5,16 +5,16 @@
<head>
<title>Modal</title>
<meta charset="UTF-8">
- <link href="/dropin/1.4.0/vendor/normalize.css" rel="stylesheet">
- <link href="/dropin/1.4.0/braintree-dropin.css" rel="stylesheet">
- <script src="/dropin/1.4.0/vendor/modernizr.js"></script>
+ <link href="/dropin/1.6.0/vendor/normalize.css" rel="stylesheet">
+ <link href="/dropin/1.6.0/braintree-dropin.css" rel="stylesheet">
+ <script src="/dropin/1.6.0/vendor/modernizr.js"></script>
</head>
<body class="modal-frame">
<div id="container"></div>
<div class="modal-wrap"></div>
- <!--[if LT IE 9]><script src="/dropin/1.4.0/vendor/jquery-1.11.0.js"></script><![endif]-->
- <!--[if gte IE 9]><!--><script src="/dropin/1.4.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
- <script src="/dropin/1.4.0/braintree-dropin-internal.min.js"></script>
+ <!--[if LT IE 9]><script src="/dropin/1.6.0/vendor/jquery-1.11.0.js"></script><![endif]-->
+ <!--[if gte IE 9]><!--><script src="/dropin/1.6.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
+ <script src="/dropin/1.6.0/braintree-dropin-internal.min.js"></script>
<script>
var modalFrame = new braintree.dropin.ModalFrame({
container: document.getElementById("container")
View
0  ...ssets/dropin/1.4.0/vendor/jquery-2.1.0.js → ...ssets/dropin/1.6.0/vendor/jquery-2.1.0.js
File renamed without changes
View
0  ...e_assets/dropin/1.4.0/vendor/modernizr.js → ...e_assets/dropin/1.6.0/vendor/modernizr.js
File renamed without changes
View
0  ..._assets/dropin/1.4.0/vendor/normalize.css → ..._assets/dropin/1.6.0/vendor/normalize.css
File renamed without changes
View
10 spec/dummy/public/braintree.js
5 additions, 5 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.