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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-06-15 21:51:22 +03:00
parent 6246ff2933
commit 605a04a32f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/AccountController.php
View File

@ -681,7 +681,7 @@ class AccountController extends \BaseController {
File::delete('logo/' . $account->account_key . '.jpg'); File::delete('logo/' . $account->account_key . '.jpg');
$image = Image::make($path)->resize(200, 120, true, false); $image = Image::make($path)->resize(200, 120, true, false);
Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath()); Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath());
} }
Event::fire('user.refresh'); Event::fire('user.refresh');

2
app/lang/en/texts.php
View File

@ -185,7 +185,7 @@ return array(
'users' => 'Users', 'users' => 'Users',
'localization' => 'Localization', 'localization' => 'Localization',
'remove_logo' => 'Remove logo', 'remove_logo' => 'Remove logo',
'logo_help' => 'Supported: JPEG, GIF and PNG. Recommended height: 120px', 'logo_help' => 'Supported: JPEG, GIF and PNG. Recommended size: 200px width by 120px height',
'payment_gateway' => 'Payment Gateway', 'payment_gateway' => 'Payment Gateway',
'gateway_id' => 'Provider', 'gateway_id' => 'Provider',
'email_notifications' => 'Email Notifications', 'email_notifications' => 'Email Notifications',

2
app/views/public/header.blade.php
View File

@ -197,7 +197,7 @@
<div class="row2"> <div class="row2">
<a href="https://github.com/hillelcoren/invoice-ninja" target="_blank"><img src="{{ asset('images/hex-github.png') }}"></a> <a href="https://github.com/hillelcoren/invoice-ninja" target="_blank"><img src="{{ asset('images/hex-github.png') }}"></a>
<a href="https://www.pinterest.com/invoiceninja" target="_blank"><img src="{{ asset('images/hex-pinterest.png') }}"></a> <a href="https://www.pinterest.com/invoiceninja" target="_blank"><img src="{{ asset('images/hex-pinterest.png') }}"></a>
<a href="http://blog.invoiceninja.com/feed/rss2" target="_blank"><img src="{{ asset('images/hex-rss.png') }}"></a> <a href="http://feeds.feedburner.com/invoiceninja" target="_blank"><img src="{{ asset('images/hex-rss.png') }}"></a>
</div> </div>
</div> </div>
<!--<h3><span class="glyphicon glyphicon-envelope"></span>Join Our Free Newsletter</h3>--> <!--<h3><span class="glyphicon glyphicon-envelope"></span>Join Our Free Newsletter</h3>-->

4
public/built.public.css
View File

@ -20,6 +20,7 @@ body {
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
line-height: 1.6; line-height: 1.6;
background-color: #fff; background-color: #fff;
overflow-x: hidden;
} }
.center-block { .center-block {
margin: 0 auto!; margin: 0 auto!;
@ -254,7 +255,6 @@ section.features4 {
padding-bottom: 0; padding-bottom: 0;
} }
section.features.upper-footer { section.features.upper-footer {
background-color: #fad129; background-color: #fad129;
padding: 40px 0; padding: 40px 0;
@ -751,6 +751,7 @@ footer.footer form#mad_mimi_signup_form input {
margin-bottom: 10px; margin-bottom: 10px;
} }
section.features, section.blue, section, section.secure, section.about, section.team, section.contact { section.features, section.blue, section, section.secure, section.about, section.team, section.contact {
padding: 40px 0; padding: 40px 0;
margin: 0 !important; margin: 0 !important;
@ -782,7 +783,6 @@ padding: 20px 0 0 0;
section.features-splash { section.features-splash {
margin-top: -20px !important; margin-top: -20px !important;
} }
section.features .col-md-7 img{ section.features .col-md-7 img{
max-width: 100%; max-width: 100%;
margin: 0; margin: 0;