1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 09:04:35 +01:00

Merge pull request #16 from raziraz/master

Dashboard table headers, global button change.
This commit is contained in:
Hillel Coren 2014-02-27 16:08:05 +02:00
commit ad092ef43c
8 changed files with 14 additions and 15 deletions

View File

@ -75,7 +75,7 @@
</div>
<center>
{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_success_submit('Save')->append_with_icon('floppy-disk') }}
</center>
{{ Former::close() }}

View File

@ -18,7 +18,7 @@
{{ Former::textarea('invoice_terms')->label('Set default invoice terms') }}
{{ Former::textarea('email_footer')->label('Set default email signature') }}
{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
{{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }}
{{ Former::close() }}
@stop

View File

@ -45,7 +45,7 @@
@endforeach
{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
{{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }}
{{ Former::close() }}

View File

@ -148,10 +148,8 @@
</script>
<center class="buttons">
{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
</center>

View File

@ -28,10 +28,9 @@
</div>
</div>
<center style="margin-top:16px">
{{ Button::lg_primary_submit('Save') }} &nbsp;|&nbsp;
{{ link_to('credits/' . ($credit ? $credit->public_id : ''), 'Cancel') }}
<center class="buttons">
{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_default_link('credits/' . ($credit ? $credit->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
</center>
{{ Former::close() }}

View File

@ -98,8 +98,8 @@
<div class="row">
<div class="col-md-6">
<div class="panel panel-default dashboard" style="min-height:320px">
<div class="panel-heading">
<div class="panel panel-default dashboard" style="min-height:320px;">
<div class="panel-heading" style="margin:0;">
<h3 class="panel-title">
<i class="glyphicon glyphicon-time"></i> Upcoming invoices
</h3>

View File

@ -32,9 +32,9 @@
</div>
</div>
<center style="margin-top:16px">
{{ Button::lg_primary_submit_success('Save') }} &nbsp;|&nbsp;
{{ link_to('payments/' . ($payment ? $payment->public_id : ''), 'Cancel') }}
<center class="buttons">
{{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_default_link('payments/' . ($payment ? $payment->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
</center>
{{ Former::close() }}

View File

@ -448,6 +448,8 @@ background-clip: padding-box;
}
.panel-body {padding: 25px;}
.dashboard .panel-heading { margin: -1px; }
.dashboard .panel-body {padding: 0;}
.dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;}