1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00

Minor refinements to card feature

This commit is contained in:
Hillel Coren 2017-02-22 22:07:30 +02:00
parent 44c2959f05
commit bcb044a776
5 changed files with 18 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -280,11 +280,11 @@ fieldset[disabled] .btn-success:active,
.btn-success.disabled.active, .btn-success.disabled.active,
.btn-success[disabled].active, .btn-success[disabled].active,
fieldset[disabled] .btn-success.active { fieldset[disabled] .btn-success.active {
background: #42d165; background: #5cb85c;
} }
.btn-success .badge { .btn-success .badge {
color: #42d165; color: #5cb85c;
} }
.btn-success:hover, .btn-success:hover,
@ -295,5 +295,5 @@ fieldset[disabled] .btn-success.active {
.open > .dropdown-toggle.btn-success, .open > .dropdown-toggle.btn-success,
.label-success[href]:hover, .label-success[href]:hover,
.label-success[href]:focus{ .label-success[href]:focus{
background-color: #38b254; background-color: #5cb85c;
} }

View File

@ -5,6 +5,13 @@
<script src="{{ asset('js/card.min.js') }}"></script> <script src="{{ asset('js/card.min.js') }}"></script>
<style type="text/css">
div.jp-card-container {
transform: scale(.89) !important;
transform-origin: right top;
}
</style>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
@ -29,7 +36,7 @@
nameInput: 'input#first_name, input#last_name' nameInput: 'input#first_name, input#last_name'
}, },
width: 255, // optional — default 350px //width: 100, // optional — default 350px
formatting: true, // optional - default true formatting: true, // optional - default true
// Strings for translation - optional // Strings for translation - optional
@ -196,14 +203,14 @@
@endif @endif
<div class="row"> <div class="row">
<div class="col-md-{{ ($accountGateway->gateway_id == GATEWAY_BRAINTREE) ? 12 : 8 }}"> <div class="col-lg-{{ ($accountGateway->gateway_id == GATEWAY_BRAINTREE) ? 12 : 8 }}">
<h3> <h3>
{{ trans('texts.billing_method') }} {{ trans('texts.billing_method') }}
@if (isset($acceptedCreditCardTypes)) @if (isset($acceptedCreditCardTypes))
&nbsp; &nbsp;
@foreach ($acceptedCreditCardTypes as $card) @foreach ($acceptedCreditCardTypes as $card)
<img src="{{ $card['source'] }}" alt="{{ $card['alt'] }}" style="width: 34px; display: inline; margin-left: 8px;"/> <img src="{{ $card['source'] }}" alt="{{ $card['alt'] }}" style="width: 34px; display: inline; margin-left: 7px;"/>
@endforeach @endforeach
@endif @endif
<br/> <br/>
@ -283,8 +290,7 @@
<div class="row" style="padding-top:18px"> <div class="row" style="padding-top:18px">
<div class="col-md-5"> <div class="col-md-12">
@if (isset($amount) && $client && $account->showTokenCheckbox($storageGateway/* will contain gateway id */)) @if (isset($amount) && $client && $account->showTokenCheckbox($storageGateway/* will contain gateway id */))
<input id="token_billing" type="checkbox" name="token_billing" {{ $account->selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top"> <input id="token_billing" type="checkbox" name="token_billing" {{ $account->selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
<label for="token_billing" class="checkbox" style="display: inline;">{{ trans('texts.token_billing') }}</label> <label for="token_billing" class="checkbox" style="display: inline;">{{ trans('texts.token_billing') }}</label>
@ -299,7 +305,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-lg-4">
<div class='card-wrapper'></div> <div class='card-wrapper'></div>
</div> </div>
</div> </div>

View File

@ -126,7 +126,7 @@ header h3 em {
} }
.secure h3 { .secure h3 {
color: #42d165; color: #5cb85c;
font-size: 30px; font-size: 30px;
margin-bottom: 8px; margin-bottom: 8px;
margin-top: 0px; margin-top: 0px;