Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Style fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-02-19 12:35:46 +02:00
parent c94c60c33e
commit 5f6cb53837
5 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/accounts/payments.blade.php
View File

@ -1,26 +1,5 @@
@extends('accounts.nav') @extends('accounts.nav')
@section('head')
@parent
<style type="text/css">
/* bootstrap 3.2.0 fix */
/* https://github.com/twbs/bootstrap/issues/13984 */
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
margin-left: 0;
margin-right: 5px;
height: inherit;
width: inherit;
float: left;
display: inline-block;
position: relative;
margin-top: 3px;
}
</style>
@stop
@section('content') @section('content')
@parent @parent

46
app/views/payments/payment.blade.php
View File

@ -50,8 +50,8 @@ header {
} }
.panel-body { .panel-body {
padding-left: 100px; padding-left: 150px;
padding-right: 100px; padding-right: 150px;
} }
} }
@ -166,16 +166,16 @@ header h3 em {
<div> <div>
<h3>{{ trans('texts.contact_information') }}</h3> <h3>{{ trans('texts.contact_information') }}</h3>
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('first_name')->placeholder(trans('texts.first_name'))->raw() }} {{ Former::text('first_name')->placeholder(trans('texts.first_name'))->raw() }}
</div> </div>
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('last_name')->placeholder(trans('texts.last_name'))->raw() }} {{ Former::text('last_name')->placeholder(trans('texts.last_name'))->raw() }}
</div> </div>
</div> </div>
@if (isset($paymentTitle)) @if (isset($paymentTitle))
<div class="row"> <div class="row">
<div class="col-md-10"> <div class="col-md-12">
{{ Former::text('email')->placeholder(trans('texts.email'))->raw() }} {{ Former::text('email')->placeholder(trans('texts.email'))->raw() }}
</div> </div>
</div> </div>
@ -183,39 +183,42 @@ header h3 em {
<p>&nbsp;<br/>&nbsp;</p> <p>&nbsp;<br/>&nbsp;</p>
<h3>{{ trans('texts.billing_address') }}</h3> <h3>{{ trans('texts.billing_address') }} &nbsp;<span class="help">{{ trans('texts.payment_footer1') }}</span></h3>
<div class="row"> <div class="row">
<div class="col-md-10"> <div class="col-md-12">
{{ Former::text('address1')->placeholder(trans('texts.address1'))->raw() }} {{ Former::text('address1')->placeholder(trans('texts.address1'))->raw() }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('address2')->placeholder(trans('texts.address2'))->raw() }} {{ Former::text('address2')->placeholder(trans('texts.address2'))->raw() }}
</div> </div>
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('city')->placeholder(trans('texts.city'))->raw() }} {{ Former::text('city')->placeholder(trans('texts.city'))->raw() }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('state')->placeholder(trans('texts.state'))->raw() }} {{ Former::text('state')->placeholder(trans('texts.state'))->raw() }}
</div> </div>
<div class="col-md-5"> <div class="col-md-6">
{{ Former::text('postal_code')->placeholder(trans('texts.postal_code'))->raw() }} {{ Former::text('postal_code')->placeholder(trans('texts.postal_code'))->raw() }}
</div> </div>
</div> </div>
<p>&nbsp;<br/>&nbsp;</p> <p>&nbsp;<br/>&nbsp;</p>
<h3>{{ trans('texts.billing_method') }} &nbsp;<span class="help">{{ trans('texts.match_address') }}</span></h3> <h3>{{ trans('texts.billing_method') }}</h3>
<div class="row"> <div class="row">
<div class="col-md-10"> <div class="col-md-9">
{{ Former::text('card_number')->placeholder(trans('texts.card_number'))->raw() }} {{ Former::text('card_number')->placeholder(trans('texts.card_number'))->raw() }}
</div> </div>
<div class="col-md-3">
{{ Former::text('cvv')->placeholder(trans('texts.cvv'))->raw() }}
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-6">
{{ Former::select('expiration_month')->placeholder(trans('texts.expiration_month')) {{ Former::select('expiration_month')->placeholder(trans('texts.expiration_month'))
->addOption('01 - January', '1') ->addOption('01 - January', '1')
->addOption('02 - February', '2') ->addOption('02 - February', '2')
@ -231,7 +234,7 @@ header h3 em {
->addOption('12 - December', '12')->raw(); ->addOption('12 - December', '12')->raw();
}} }}
</div> </div>
<div class="col-md-4"> <div class="col-md-6">
{{ Former::select('expiration_year')->placeholder(trans('texts.expiration_year')) {{ Former::select('expiration_year')->placeholder(trans('texts.expiration_year'))
->addOption('2014', '2014') ->addOption('2014', '2014')
->addOption('2015', '2015') ->addOption('2015', '2015')
@ -242,22 +245,19 @@ header h3 em {
->addOption('2020', '2020')->raw(); ->addOption('2020', '2020')->raw();
}} }}
</div> </div>
<div class="col-md-2">
{{ Former::text('cvv')->placeholder(trans('texts.cvv'))->raw() }}
</div>
</div> </div>
<div class="row" style="padding-top:18px"> <div class="row" style="padding-top:18px">
<div class="col-md-4"> <div class="col-md-5">
@if ($account->showTokenCheckbox()) @if ($account->showTokenCheckbox())
<input id="token_billing" type="checkbox" name="token_billing" {{ $account->selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:text-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; font-size:15px">{{ trans('texts.token_billing') }}</label> <label for="token_billing" class="checkbox" style="display: inline;">{{ trans('texts.token_billing') }}</label>
<span class="help-block" style="font-size:15px">{{ trans('texts.token_billing_secure', ['stripe_link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) }}</span> <span class="help-block" style="font-size:15px">{{ trans('texts.token_billing_secure', ['stripe_link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) }}</span>
@endif @endif
</div> </div>
<div class="col-md-6"> <div class="col-md-7">
@if (isset($acceptedCreditCardTypes)) @if (isset($acceptedCreditCardTypes))
<div class="pull-right"> <div class="pull-right">
@foreach ($acceptedCreditCardTypes as $card) @foreach ($acceptedCreditCardTypes as $card)
@ -272,7 +272,7 @@ header h3 em {
<p>&nbsp;<br/>&nbsp;</p> <p>&nbsp;<br/>&nbsp;</p>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-3"> <div class="col-md-4 col-md-offset-4">
{{ Button::block_success_submit_lg(strtoupper(trans('texts.pay_now') . ' - ' . Utils::formatMoney($amount, $currencyId) )) }} {{ Button::block_success_submit_lg(strtoupper(trans('texts.pay_now') . ' - ' . Utils::formatMoney($amount, $currencyId) )) }}
</div> </div>
</div> </div>

17
public/built.css
View File

@ -2892,4 +2892,19 @@ table.table thead .sorting_asc_disabled:after { content: '' !important }
table.table thead .sorting_desc_disabled:after { content: '' !important } table.table thead .sorting_desc_disabled:after { content: '' !important }
/* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */ /* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */
body.modal-open { overflow:inherit; padding-right:inherit !important; } body.modal-open { overflow:inherit; padding-right:inherit !important; }
/* bootstrap 3.2.0 fix */
/* https://github.com/twbs/bootstrap/issues/13984 */
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
margin-left: 0;
margin-right: 5px;
height: inherit;
width: inherit;
float: left;
display: inline-block;
position: relative;
margin-top: 3px;
}

5
public/built.js
View File

@ -33013,11 +33013,6 @@ function setDocHexDraw(doc, hex) {
return doc.setDrawColor(r, g, b); return doc.setDrawColor(r, g, b);
} }
function openUrl(url, track) {
trackUrl(track ? track : url);
window.open(url, '_blank');
}
function toggleDatePicker(field) { function toggleDatePicker(field) {
$('#'+field).datepicker('show'); $('#'+field).datepicker('show');
} }

17
public/css/style.css
View File

@ -784,4 +784,19 @@ table.table thead .sorting_asc_disabled:after { content: '' !important }
table.table thead .sorting_desc_disabled:after { content: '' !important } table.table thead .sorting_desc_disabled:after { content: '' !important }
/* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */ /* Prevent modal from shifting page a bit - https://github.com/twbs/bootstrap/issues/9886 */
body.modal-open { overflow:inherit; padding-right:inherit !important; } body.modal-open { overflow:inherit; padding-right:inherit !important; }
/* bootstrap 3.2.0 fix */
/* https://github.com/twbs/bootstrap/issues/13984 */
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
margin-left: 0;
margin-right: 5px;
height: inherit;
width: inherit;
float: left;
display: inline-block;
position: relative;
margin-top: 3px;
}