1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

This commit is contained in:
Hillel Coren 2016-08-15 15:15:32 +03:00
commit 18d4cbcfbc
9 changed files with 8 additions and 7 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

@ -486,7 +486,8 @@ background-clip: padding-box;
}
.in-image {
float:left;padding-right:25px;
float: left;
margin-right: 25px;
}
.in-white {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -8,7 +8,7 @@
<div class="panel panel-default">
<div class="panel-body">
<img src="{{ asset('images/totalinvoices.png') }}"
class="in-image" style="float:left"/>
class="in-image" style="float:left" width="80" height="80"/>
<div style="overflow:hidden">
<div class="in-thin">
{{ trans('texts.total_revenue') }}
@ -30,7 +30,7 @@
<div class="panel panel-default">
<div class="panel-body">
<img src="{{ asset('images/clients.png') }}"
class="in-image" style="float:left"/>
class="in-image" style="float:left" width="80" height="80"/>
<div style="overflow:hidden">
<div class="in-thin">
{{ trans('texts.average_invoice') }}
@ -52,7 +52,7 @@
<div class="panel panel-default">
<div class="panel-body">
<img src="{{ asset('images/totalincome.png') }}"
class="in-image" style="float:left"/>
class="in-image" style="float:left" width="80" height="80"/>
<div style="overflow:hidden">
<div class="in-thin">
{{ trans('texts.outstanding') }}

View File

@ -385,7 +385,7 @@
</button>
<a href="{{ URL::to(NINJA_WEB_URL) }}" class='navbar-brand' target="_blank">
{{-- Per our license, please do not remove or modify this link. --}}
<img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:20px;width:auto;padding-right:10px"/>
<img src="{{ asset('images/invoiceninja-logo.png') }}" width="193" height="25"/>
</a>
</div>