From e160f1b53662aac5186bbd4671464986e4c1c5bd Mon Sep 17 00:00:00 2001 From: Andrew Abogado Date: Thu, 12 Feb 2015 00:53:33 +0800 Subject: [PATCH] AA: Merge updated design to app --- .../webapp/components/dashboard/_owners.html | 7 +- .../webapp/components/dashboard/_pets.html | 7 +- .../webapp/components/dashboard/_vets.html | 7 +- .../webapp/components/dashboard/_welcome.html | 25 +++-- src/main/webapp/components/footer.html | 52 ++++++++++- src/main/webapp/components/header.html | 26 ++---- .../components/landing/_appointment.html | 48 +++++----- .../webapp/components/landing/_banner.html | 17 +++- .../webapp/components/landing/_companies.html | 32 +------ .../components/landing/_contact_us.html | 22 ----- .../webapp/components/landing/_numbers.html | 34 +++++++ .../webapp/components/landing/_services.html | 56 ++++++++--- .../components/landing/_testimonials.html | 34 +++---- src/main/webapp/components/landing/_vets.html | 81 +++++++++++----- .../webapp/components/landing/landing.html | 26 +++--- .../components/owners/owner_details.html | 88 +++++++++--------- src/main/webapp/components/owners/owners.html | 16 ++++ src/main/webapp/components/pets/pets.html | 16 ++++ .../veterinarians/veterinarians.html | 2 +- src/main/webapp/images/arrow-down.png | Bin 0 -> 391 bytes src/main/webapp/images/bg-appointment.png | Bin 0 -> 817320 bytes src/main/webapp/images/client-logos.png | Bin 0 -> 7595 bytes src/main/webapp/images/image-service-1.png | Bin 0 -> 134329 bytes src/main/webapp/images/image-service-2.png | Bin 0 -> 206095 bytes src/main/webapp/images/image-service-3.png | Bin 0 -> 138260 bytes src/main/webapp/images/logo-brand.png | Bin 0 -> 6044 bytes src/main/webapp/images/logo-footer.png | Bin 0 -> 942 bytes src/main/webapp/images/logo.png | Bin 1321 -> 4437 bytes src/main/webapp/images/testimonial-tiles.png | Bin 0 -> 543842 bytes src/main/webapp/images/vets/vet7.jpg | Bin 0 -> 14841 bytes src/main/webapp/images/vets/vet8.jpg | Bin 0 -> 11018 bytes src/main/webapp/static/app/styles/main.scss | 7 +- src/main/webapp/static/dist/dashboard.html | 1 - src/main/webapp/styles/main.css | 2 +- src/main/webapp/videos/hero-bird.mp4 | Bin 779088 -> 0 bytes src/main/webapp/videos/hero.mp4 | Bin 0 -> 4940324 bytes 36 files changed, 360 insertions(+), 246 deletions(-) delete mode 100644 src/main/webapp/components/landing/_contact_us.html create mode 100644 src/main/webapp/components/landing/_numbers.html create mode 100644 src/main/webapp/images/arrow-down.png create mode 100644 src/main/webapp/images/bg-appointment.png create mode 100644 src/main/webapp/images/client-logos.png create mode 100644 src/main/webapp/images/image-service-1.png create mode 100644 src/main/webapp/images/image-service-2.png create mode 100644 src/main/webapp/images/image-service-3.png create mode 100644 src/main/webapp/images/logo-brand.png create mode 100644 src/main/webapp/images/logo-footer.png create mode 100644 src/main/webapp/images/testimonial-tiles.png create mode 100644 src/main/webapp/images/vets/vet7.jpg create mode 100644 src/main/webapp/images/vets/vet8.jpg delete mode 100644 src/main/webapp/videos/hero-bird.mp4 create mode 100644 src/main/webapp/videos/hero.mp4 diff --git a/src/main/webapp/components/dashboard/_owners.html b/src/main/webapp/components/dashboard/_owners.html index 1ba64f57c..7751b17ae 100644 --- a/src/main/webapp/components/dashboard/_owners.html +++ b/src/main/webapp/components/dashboard/_owners.html @@ -1,5 +1,6 @@
+ See All Owners

Owners

@@ -23,11 +24,5 @@
- -
- -
\ No newline at end of file diff --git a/src/main/webapp/components/dashboard/_pets.html b/src/main/webapp/components/dashboard/_pets.html index d29621561..6e70e0b7a 100644 --- a/src/main/webapp/components/dashboard/_pets.html +++ b/src/main/webapp/components/dashboard/_pets.html @@ -1,5 +1,6 @@
+ See All Pets

Pets

@@ -13,11 +14,5 @@
- -
- -
\ No newline at end of file diff --git a/src/main/webapp/components/dashboard/_vets.html b/src/main/webapp/components/dashboard/_vets.html index 4c28a44bb..dc23a1252 100644 --- a/src/main/webapp/components/dashboard/_vets.html +++ b/src/main/webapp/components/dashboard/_vets.html @@ -1,5 +1,6 @@
+ See All Veterinarians

Veterinarians

@@ -13,11 +14,5 @@
- -
\ No newline at end of file diff --git a/src/main/webapp/components/dashboard/_welcome.html b/src/main/webapp/components/dashboard/_welcome.html index a72ab8f65..10e74a600 100644 --- a/src/main/webapp/components/dashboard/_welcome.html +++ b/src/main/webapp/components/dashboard/_welcome.html @@ -1,14 +1,25 @@ -
+
-
-
- +
+
+
    +
  • 12Vets Around
  • +
  • 5Your Tasks
  • +
  • 8Appointments
  • +
-

Welcome, John Doe

-

When you’re ready, you may start adding a new pet owner or continue browsing.

+
+
+ +
+
+

Welcome back, John Doe

+

Todays date is 14th February 2014

+
+
-
+
\ No newline at end of file diff --git a/src/main/webapp/components/footer.html b/src/main/webapp/components/footer.html index f9110a12f..c34464de3 100644 --- a/src/main/webapp/components/footer.html +++ b/src/main/webapp/components/footer.html @@ -1,7 +1,49 @@ \ No newline at end of file +
+ +
+
+

Company Information

+
+
+

Wanna talk?

+
    +
  • Call us at (203) 420-0234
  • +
  • Email us to info@petclinic.com
  • +
  • We respond to emails within one business day. Hours: Mon - Fri from 9am - 7pm ET
  • +
      +
+
+

Follow Us

+
+
+

Questions or comments

+

Cras mattis consectetur purus sit amet fermentum.

+

+ Drop us a line +

+
+
+
+ + +
+
+

+ © 2015 Pet Clinic, A Spring Framework Demonstration. +

+

Design by Andrew Abogado. See the Colophon for details on the design and code.

+
+
\ No newline at end of file diff --git a/src/main/webapp/components/header.html b/src/main/webapp/components/header.html index 3936f83e4..f34374c91 100644 --- a/src/main/webapp/components/header.html +++ b/src/main/webapp/components/header.html @@ -1,8 +1,8 @@ -