From 980efd5793a0e1998afdd51de45eee297d88e020 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Fri, 25 Apr 2014 12:46:57 +1000
Subject: [PATCH] Adding new panes and making it pretty

---
 .../stylesheets/darkswarm/branding.css.sass   |  2 ++
 app/assets/stylesheets/darkswarm/footer.sass  | 21 ++++--------
 .../stylesheets/darkswarm/forms.css.sass      | 34 -------------------
 .../stylesheets/darkswarm/hub_search.css.sass |  2 +-
 .../stylesheets/darkswarm/hubs.css.sass       |  3 +-
 app/assets/stylesheets/darkswarm/mixins.sass  |  4 +++
 app/views/home/index.html.haml                | 10 ++++++
 app/views/shared/_footer.html.haml            | 12 ++++++-
 8 files changed, 35 insertions(+), 53 deletions(-)
 delete mode 100644 app/assets/stylesheets/darkswarm/forms.css.sass

diff --git a/app/assets/stylesheets/darkswarm/branding.css.sass b/app/assets/stylesheets/darkswarm/branding.css.sass
index 2f0d5dc607..f96fbdfcc9 100644
--- a/app/assets/stylesheets/darkswarm/branding.css.sass
+++ b/app/assets/stylesheets/darkswarm/branding.css.sass
@@ -5,3 +5,5 @@ $clr-blonde: #f7f4ef
 
 $disabled-dark: #999
 $disabled-bright: #ccc
+
+$dark-grey: #333
diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass
index df649a8d59..a2c8c56a9d 100644
--- a/app/assets/stylesheets/darkswarm/footer.sass
+++ b/app/assets/stylesheets/darkswarm/footer.sass
@@ -1,16 +1,7 @@
-@import variables
+@import branding
+@import mixins
 
-#footer
-  padding: 74px 0px 0px
-  background: $fawn
-  margin-top: 85px
-
-  #copyright 
-    clear: both
-    img
-      display: block
-      margin: 0px auto 8px
-
-  .contact
-    strong
-      padding-right: 1em
+footer
+  background: $dark-grey
+  @include panepadding
+  color: white
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/forms.css.sass b/app/assets/stylesheets/darkswarm/forms.css.sass
deleted file mode 100644
index e519b2818f..0000000000
--- a/app/assets/stylesheets/darkswarm/forms.css.sass
+++ /dev/null
@@ -1,34 +0,0 @@
-@import variables
-
-.darkswarm
-  fieldset
-    padding: 0px
-    border: none
-    legend
-      border: 1px solid $dark-grey
-      border-left: 0px
-      border-right: 0px
-      padding: 16px 24px
-      display: block
-      width: 100%
-      margin-bottom: 1em
-      color: #999999
-      text-transform: uppercase
-    dd a
-      border: 1px solid $dark-grey
-      border-left: 0px
-      border-right: 0px
-      padding: 16px 24px
-      display: block
-      width: 100%
-      margin-bottom: 1em
-      color: #999999
-      text-transform: uppercase
-      color: #999999
-      font-weight: bold
-      text-transform: uppercase
-      background: transparent
-      .text-right
-        font-weight: normal
-        text-transform: none
-
diff --git a/app/assets/stylesheets/darkswarm/hub_search.css.sass b/app/assets/stylesheets/darkswarm/hub_search.css.sass
index c7d733accb..a66e32ae6c 100644
--- a/app/assets/stylesheets/darkswarm/hub_search.css.sass
+++ b/app/assets/stylesheets/darkswarm/hub_search.css.sass
@@ -1,4 +1,4 @@
-@import 'mixins'
+@import mixins
 
 #hub-search
   .advanced
diff --git a/app/assets/stylesheets/darkswarm/hubs.css.sass b/app/assets/stylesheets/darkswarm/hubs.css.sass
index 4ea035ec2a..9421fe0f42 100644
--- a/app/assets/stylesheets/darkswarm/hubs.css.sass
+++ b/app/assets/stylesheets/darkswarm/hubs.css.sass
@@ -4,5 +4,4 @@
 #hubs
   background: $clr-blonde url("/assets/home/shopping-bg.jpg")
   @include fullwidthbg
-  padding-top: 60px
-  padding-bottom: 100px
+  @include panepadding
diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass
index 43445757b7..02e1f256e4 100644
--- a/app/assets/stylesheets/darkswarm/mixins.sass
+++ b/app/assets/stylesheets/darkswarm/mixins.sass
@@ -11,6 +11,10 @@
 @mixin disabled
   color: $disabled-bright
 
+@mixin panepadding
+  padding-top: 100px
+  padding-bottom: 100px
+
 @mixin fullbg
   background-position: top center 
   background-repeat: no-repeat
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index c429df0788..b441ac647f 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -8,3 +8,13 @@
         = render partial: "modals/learn_more"
 
 = render partial: "home/hubs"
+
+= render partial: "home/map"
+
+= render partial: "home/producers"
+
+= render partial: "home/groups"
+
+= render partial: "home/beta"
+
+= render partial: "shared/footer"
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index 4b2ae59124..649221fee2 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -1,6 +1,16 @@
 %footer
   .row.landing-page-row
-    .large-6.columns.text-left
+    .small-5.columns.text-left
+      %h3 Contact us
       %strong
         %span.has-tip.tip-top{"data-tooltip" => "", "data-options" => "disable-for-touch:true", title: "Open Food Network is a marketplace connecting you to local producers and food hubs"} 
           = link_to "WHAT IS OPEN FOOD NETWORK?", "http://openfoodnetwork.org"
+    .small-2.columns
+    .small-5.columns.text-right
+      %h3 About us
+      %p OFN is a network of independent online food stores that connect farmers and food hubs with individuals and local businesses.  It gives farmers and food hubs an easier and fairer way to distribute their food. 
+  .row.landing-page-row
+    .small-12.columns.text-center
+      %p 
+      %p © Copyright 2014 Open Food Foundation
+      %small Content | Terms of Service | Code - Opensource on Github | Creative Commons / IP  | OFN.org