Merge pull request #70 from raziraz/master

Edited links for header and footer.

app/views/public/contact_us.blade.php

@@ -55,14 +55,20 @@ var contactForm = {
 
 </script>
 
-<section class="hero4" data-speed="2" data-type="background">
+@section('content')
+
+<section class="hero background hero4" data-speed="2" data-type="background">
+  <div class="caption-side"></div>
   <div class="container">
-    <div class="caption">
+    <div class="row" style="margin:0;">
-     <h1>Contact us
+      <div class="caption-wrap">
-     </h1>
+        <div class="caption">
-   </div>
+          <h1>Contact<span style="color:#ecd816"> us</span></h1>
- </div>
+            </div>
-</section>
+          </div>
+        </div>
+      </div>
+    </section>
 
 <section class="about contact">
   <div class="container">

app/views/public/header.blade.php

@@ -64,7 +64,8 @@
       <a class="brand" href="/"><img src=
         "images/invoiceninja-logo.png"></a>
         <ul class="navbar-list">
-          <li>{{ link_to('about', 'About Us' ) }}</li>
+          <li>{{ link_to('features', 'Features' ) }}</li>
+          <li>{{ link_to('faq', 'FAQ' ) }}</li>
           <li>{{ link_to('contact', 'Contact Us' ) }}</li>
           <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
         </ul>
@@ -120,7 +121,8 @@
 
 <div class="navbar-inner">
   <ul class="navbar-list">
-    <li>{{ link_to('about', 'About Us' ) }}</li>
+    <li>{{ link_to('features', 'Features' ) }}</li>
+    <li>{{ link_to('faq', 'FAQ' ) }}</li>
     <li>{{ link_to('contact', 'Contact Us' ) }}</li>
     <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
   </ul>

public/css/splash.css

@@ -182,6 +182,11 @@ a .cta:hover span {
     background-size: cover;
 }
 
+.hero2 h1 {
+    color: #fff;
+    margin: 0;
+}
+
 .hero3 {
     text-align: center;
     background-image: url(/images/hero-bg-3.jpg);
@@ -192,7 +197,6 @@ a .cta:hover span {
 }
 
 .hero4 {
-    text-align: center;
     background-image: url(/images/hero-bg-4.jpg);
     padding: 150px 0;
     background-repeat: no-repeat;
@@ -208,11 +212,6 @@ a .cta:hover span {
     background-size: cover;
 }
 
-.hero2 h1,.hero3 h1,.hero4 h1 {
-    color: #fff;
-    margin: 0;
-}
-
 .hero1.background {
     background-repeat: no-repeat;
     background-position: center center;
@@ -311,6 +310,10 @@ section.about.white-bg .col-md-5 {
     padding-right: 43px;
     padding-left: 15px;
 }
+section.about img {
+    width: 100%;
+    min-width: 100%;
+}
 
 section.contact .address .glyphicon {
     background: #edd71e;
@@ -548,6 +551,13 @@ footer .social p {
         font-size: 30px;
     }
     
+    section.about .col-md-5 {
+    padding-left: 15px !important;
+    }
+    section.about.white-bg .col-md-5 {
+    padding-right: 15px !important;
+    }
+    
     .navbar {
         text-align: center;
         padding: 25px 0 18px;