tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #37 from raziraz/master

Browse source 
Background color test
This commit is contained in:
Hillel Coren 2014-03-18 15:16:35 +02:00
commit 45d38e8266
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/about_us.blade.php
View file

@ -38,7 +38,11 @@
<div class="navbar" style="margin-bottom:0px">
<div class="container">
<div class="navbar-inner">
<<<<<<< HEAD
<a class="brand" href="#"><img src=
=======
<a class="brand" href="/"><img src=
>>>>>>> upstream/master
"images/invoiceninja-logo.png"></a>
<ul class="navbar-list">
<li>{{ link_to('about', 'About Us' ) }}</li>

0
app/views/emails/confirm_text.blade.php Executable file → Normal file
View file

10
public/css/style.css
View file

@ -1,4 +1,4 @@
body { background: #f8f8f8 !important;
body { background: #fff !important;
font-family: 'Roboto', sans-serif;
font-family: 'Roboto', sans-serif;
}
@ -220,6 +220,14 @@ border-color: #0b4d78;
margin-left: 10px !important;
}
/*alerts*/
.alert {
padding: 15px;
border: none;
border-radius: 3px;
}
/*new*/
div {

BIN
public/images/hero-bg-4.psd Normal file
View file

Binary file not shown.