Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 19:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/built.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.css.map
View File

File diff suppressed because one or more lines are too long

3
public/css/style.css vendored
View File

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

BIN
public/images/clients.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/invoiceninja-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/totalincome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/totalinvoices.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

6
resources/views/dashboard.blade.php
View File

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

2
resources/views/header.blade.php
View File

@ -385,7 +385,7 @@
</button> </button>
<a href="{{ URL::to(NINJA_WEB_URL) }}" class='navbar-brand' target="_blank"> <a href="{{ URL::to(NINJA_WEB_URL) }}" class='navbar-brand' target="_blank">
{{-- Per our license, please do not remove or modify this link. --}} {{-- 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> </a>
</div> </div>