From 7fa754c0679adccedde336bd401b7db57ecb5896 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 10 Mar 2014 19:05:00 +0200 Subject: [PATCH] merging changes --- app/views/about_us.blade.php | 116 ++++++-------- app/views/contact_us.blade.php | 9 -- app/views/splash.blade.php | 10 -- composer.lock | 284 +++++++++++++++++++-------------- public/css/splash.css | 8 +- public/images/Thumbs.db | Bin 164352 -> 183296 bytes public/images/about1.jpg | Bin 0 -> 30861 bytes public/images/about2.jpg | Bin 0 -> 47959 bytes public/images/hero-bg-4.psd | Bin 0 -> 17535412 bytes 9 files changed, 216 insertions(+), 211 deletions(-) create mode 100644 public/images/about1.jpg create mode 100644 public/images/about2.jpg create mode 100644 public/images/hero-bg-4.psd diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php index 118d6f26b435..d1f51a43450c 100644 --- a/app/views/about_us.blade.php +++ b/app/views/about_us.blade.php @@ -9,68 +9,44 @@ @stop @section('body') - -{{ Form::open(array('url' => 'get_started', 'id' => 'startForm')) }} -{{ Form::hidden('guest_key') }} -{{ Form::close() }} - ---> + - -
-
-
-

WHY INVOICE NINJA? -

+
+
+
+

WHY INVOICE NINJA? +

+
-
-
+ -
+
@@ -86,6 +62,7 @@
+
@@ -105,27 +82,26 @@
+
- + + +