From 8f1c301d823a441935e783cdb6c39ba7bcddb9eb Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Tue, 24 Sep 2013 21:46:52 -0700 Subject: Logo Changes. Switching to the Foursquare logo for the index page. Adding the foursquare logo along top the grow logo on other pages. --- src/templates/macros/common-page.ftl | 2 +- src/templates/pages/index.html.ftl | 33 ++++++++++++++++++++++++++---- src/templates/templates/header.ftl | 12 +++++++++++ src/templates/templates/nav.ftl | 38 ++++++++++++----------------------- web/images/foursquarelg.png | Bin 0 -> 5616 bytes web/images/foursquaresm.png | Bin 0 -> 1884 bytes web/style.css | 7 +++++++ 7 files changed, 62 insertions(+), 30 deletions(-) create mode 100644 src/templates/templates/header.ftl create mode 100644 web/images/foursquarelg.png create mode 100644 web/images/foursquaresm.png diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 92b508f..512128b 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -12,7 +12,7 @@
- <#include "/templates/nav.ftl"> + <#include "/templates/header.ftl"> <#nested> diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl index 785e729..94eaec3 100644 --- a/src/templates/pages/index.html.ftl +++ b/src/templates/pages/index.html.ftl @@ -1,7 +1,25 @@ <#include "/macros/common.ftl"> -<#include "/macros/common-page.ftl"> + + + + Grow Process + + + + + + + + +
+
+

+ +

+ + <#include "/templates/nav.ftl"> +
-<@commonpage> <#include "/templates/index-hero.ftl"> <@content> @@ -10,7 +28,7 @@ GROW is an on-line web based spiritual formation process created by Foursquare Puyallup church with you in mind, to assist you in your journey to discover God, and to be an effective - follower of Jesus Christ. + follower of Jesus Christ.

@@ -18,4 +36,11 @@ - + +
+
+ +<#include "/templates/footer.ftl"> + + + diff --git a/src/templates/templates/header.ftl b/src/templates/templates/header.ftl new file mode 100644 index 0000000..8d568bf --- /dev/null +++ b/src/templates/templates/header.ftl @@ -0,0 +1,12 @@ +
+

+ <#if user??> + Grow Process + <#else> + Grow Process + + Foursqaure Church +

+ + <#include "/templates/nav.ftl"> +
diff --git a/src/templates/templates/nav.ftl b/src/templates/templates/nav.ftl index 6816568..c1f22ae 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -6,28 +6,16 @@ href="${href}"><#nested> -
-

- <#if user??> - Grow Process - <#else> - Grow Process - -

- - -
- + diff --git a/web/images/foursquarelg.png b/web/images/foursquarelg.png new file mode 100644 index 0000000..bb01365 Binary files /dev/null and b/web/images/foursquarelg.png differ diff --git a/web/images/foursquaresm.png b/web/images/foursquaresm.png new file mode 100644 index 0000000..263e0d9 Binary files /dev/null and b/web/images/foursquaresm.png differ diff --git a/web/style.css b/web/style.css index 17489f9..b6a83f0 100644 --- a/web/style.css +++ b/web/style.css @@ -64,10 +64,17 @@ header h1 img { vertical-align: middle; } +#foursquarefloat { + position: relative; + left: -140px; + top: -20px; +} + header nav { display: inline; float: right; margin-top: 2em; + margin-bottom: 2em; } nav ul { -- cgit v1.2.3