Skip to content

Commit

Permalink
Merge pull request #107 from wacii/update-assets
Browse files Browse the repository at this point in the history
update client to 2.11.2  and drop-in to 1.8.3
  • Loading branch information
birarda committed Aug 26, 2015
2 parents f5cd212 + 17cbb17 commit 5ef85b0
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions asset_versions.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
client_version: 2.9.0
dropin_version: 1.7.0
client_version: 2.11.2
dropin_version: 1.8.3

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 0;
height: 28px;
width: 44px;
Expand All @@ -101,13 +101,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -212px;
height: 29px;
width: 44px;
Expand All @@ -119,13 +119,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -184px;
height: 28px;
width: 44px;
Expand All @@ -137,13 +137,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -128px;
height: 28px;
width: 44px;
Expand All @@ -155,13 +155,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -72px;
height: 28px;
width: 44px;
Expand All @@ -173,13 +173,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -259px;
height: 28px;
width: 44px;
Expand All @@ -191,13 +191,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/images/1x-s0fcd0a14c6.png');
background-position: 0 -147px;
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.maestro {
background-image: url('/dropin/1.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -156px;
height: 28px;
width: 44px;
Expand All @@ -209,13 +209,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -287px;
height: 28px;
width: 44px;
Expand All @@ -227,13 +227,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -100px;
height: 28px;
width: 44px;
Expand All @@ -249,13 +249,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -343px;
height: 28px;
width: 44px;
Expand All @@ -267,13 +267,13 @@ img {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -315px;
height: 28px;
width: 44px;
Expand Down Expand Up @@ -2002,14 +2002,14 @@ button#coinbase-container {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -421px;
height: 16px;
width: 79px;
Expand Down Expand Up @@ -2059,15 +2059,15 @@ button.paypal {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/images/1x-s0fcd0a14c6.png');
background-position: 0 -399px;
height: 22px;
width: 61px;
display: inline-block;
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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -371px;
height: 22px;
width: 61px;
Expand Down Expand Up @@ -4222,7 +4222,7 @@ button.paypal {
background-repeat: no-repeat;
display: block;
text-indent: -999em;
background-image: url('/dropin/1.7.0/images/1x-s0fcd0a14c6.png');
background-image: url('/dropin/1.8.3/images/1x-s0fcd0a14c6.png');
background-position: 0 -101px;
height: 18px;
width: 18px;
Expand All @@ -4231,7 +4231,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.7.0/images/2x-sf9a66b4f5a.png');
background-image: url('/dropin/1.8.3/images/2x-sf9a66b4f5a.png');
background-position: 0 -241px;
height: 18px;
width: 18px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<head>
<title>Cards</title>
<meta charset="UTF-8">
<link href="/dropin/1.7.0/vendor/normalize.css" rel="stylesheet">
<link href="/dropin/1.7.0/braintree-dropin.css" rel="stylesheet">
<script src="/dropin/1.7.0/vendor/modernizr.js"></script>
<link href="/dropin/1.8.3/vendor/normalize.css" rel="stylesheet">
<link href="/dropin/1.8.3/braintree-dropin.css" rel="stylesheet">
<script src="/dropin/1.8.3/vendor/modernizr.js"></script>
</head>
<body class="inline-frame is-loading initial-inline-frame-loading">
<div id="container">
Expand Down Expand Up @@ -35,9 +35,9 @@
<button class="cancel-popup-button">Cancel PayPal Login</button>
</div>

<!--[if LT IE 9]><script src="/dropin/1.7.0/vendor/jquery-1.11.0.js"></script><![endif]-->
<!--[if gte IE 9]><!--><script src="/dropin/1.7.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
<script src="/dropin/1.7.0/braintree-dropin-internal.min.js"></script>
<!--[if LT IE 9]><script src="/dropin/1.8.3/vendor/jquery-1.11.0.js"></script><![endif]-->
<!--[if gte IE 9]><!--><script src="/dropin/1.8.3/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
<script src="/dropin/1.8.3/braintree-dropin-internal.min.js"></script>
<script>
var inlineFrame = new braintree.dropin.InlineFrame.Manager({
container: document.getElementById("container")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<head>
<title>Modal</title>
<meta charset="UTF-8">
<link href="/dropin/1.7.0/vendor/normalize.css" rel="stylesheet">
<link href="/dropin/1.7.0/braintree-dropin.css" rel="stylesheet">
<script src="/dropin/1.7.0/vendor/modernizr.js"></script>
<link href="/dropin/1.8.3/vendor/normalize.css" rel="stylesheet">
<link href="/dropin/1.8.3/braintree-dropin.css" rel="stylesheet">
<script src="/dropin/1.8.3/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.7.0/vendor/jquery-1.11.0.js"></script><![endif]-->
<!--[if gte IE 9]><!--><script src="/dropin/1.7.0/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
<script src="/dropin/1.7.0/braintree-dropin-internal.min.js"></script>
<!--[if LT IE 9]><script src="/dropin/1.8.3/vendor/jquery-1.11.0.js"></script><![endif]-->
<!--[if gte IE 9]><!--><script src="/dropin/1.8.3/vendor/jquery-2.1.0.js"></script><!--<![endif]-->
<script src="/dropin/1.8.3/braintree-dropin-internal.min.js"></script>
<script>
var modalFrame = new braintree.dropin.ModalFrame({
container: document.getElementById("container")
Expand Down
10 changes: 5 additions & 5 deletions spec/dummy/public/braintree.js

Large diffs are not rendered by default.

0 comments on commit 5ef85b0

Please sign in to comment.