From 53e2bc823d9f874520e8054ccd40982fd44e0d7c Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 1 May 2015 18:19:51 +1000 Subject: [PATCH] WIP styling and content for homepage > footer > alert @ top > call to action buttons --- app/assets/images/logo-global-white.png | Bin 0 -> 10785 bytes app/assets/stylesheets/darkswarm/footer.sass | 82 +++++++- .../stylesheets/darkswarm/home.css.sass | 20 ++ .../stylesheets/darkswarm/home_panes.css.sass | 2 +- .../stylesheets/darkswarm/typography.css.sass | 3 +- app/views/home/_brandstory.html.haml | 5 +- app/views/home/_cta1.html.haml | 4 +- app/views/home/_cta2.html.haml | 4 +- app/views/home/_stats.html.haml | 2 +- app/views/layouts/darkswarm.html.haml | 1 + app/views/shared/_footer.html.haml | 184 ++++++++++++------ app/views/shared/menu/_alert.html.haml | 8 + 12 files changed, 242 insertions(+), 73 deletions(-) create mode 100644 app/assets/images/logo-global-white.png create mode 100644 app/views/shared/menu/_alert.html.haml diff --git a/app/assets/images/logo-global-white.png b/app/assets/images/logo-global-white.png new file mode 100644 index 0000000000000000000000000000000000000000..2271020e5b30e745ffa126571828953bde2bce1b GIT binary patch literal 10785 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass index 9e3f9dac55..4907f7184f 100644 --- a/app/assets/stylesheets/darkswarm/footer.sass +++ b/app/assets/stylesheets/darkswarm/footer.sass @@ -1,15 +1,81 @@ @import branding @import mixins +@import animations footer - background: $dark-grey - border-top: 1px dotted white - @include panepadding .row - &, & * + p a + font-size: 0.875rem + a, a * + @include csstrans color: white - a, a * - color: $clr-brick-light-bright &:hover, &:active, &:focus - color: $clr-brick-bright - @include textsoftpress + color: rgba(white, 1) + text-decoration: underline + + .ofn-global + background-color: $ofn-grey + border-top: 2px solid white + padding-top: 60px + padding-bottom: 40px + .logo + width: 200px + height: 100px + background: $ofn-grey + -moz-border-radius: 120px / 60px + -webkit-border-radius: 120px / 60px + border-radius: 120px / 60px + margin: -105px auto 0 auto + img + margin-top: 25px + + .alert-box + background-color: transparent + border: none + padding: 0 + a.big-alert + @include csstrans + width: 100% + border: 1px solid rgba($dark-grey, 0.35) + background-image: url("/assets/tile-wide.png") + background-position: center center + padding: 12px 0 8px 0 + display: block + &, & * + @include csstrans + color: #333 + &:hover, &:active, &:focus + text-decoration: none + border-color: white + &, & * + color: rgba(white, 1) + .row + &, p, h1, h2, h3, h4, h5, h6 + color: $disabled-bright + + .ofn-local + background: lighten($dark-grey, 3%) + @include panepadding + .row + &, p, h1, h2, h3, h4, h5, h6 + color: $disabled-med + p.secure-icon i + font-size: 10rem + color: rgba(white, 0.1) + p.secure-text + color: rgba($disabled-med, 0.35) + .social-icons + margin-bottom: 0.25rem + margin-top: 0.75rem + a + i + font-size: 1.5rem + color: white + &:hover, &:active, &:focus + text-decoration: none + i + color: lighten($dark-grey, 60%) + text-shadow: 2px 2px 0 black + + + diff --git a/app/assets/stylesheets/darkswarm/home.css.sass b/app/assets/stylesheets/darkswarm/home.css.sass index e69de29bb2..0a4d9c1b5b 100644 --- a/app/assets/stylesheets/darkswarm/home.css.sass +++ b/app/assets/stylesheets/darkswarm/home.css.sass @@ -0,0 +1,20 @@ +@import branding +@import mixins +@import animations + +.home-alert + .alert-box + border: 1px solid rgba($dark-grey, 0.35) + background-color: $ofn-grey + background-image: url("/assets/tile-wide.png") + background-position: center center + padding: 12px 0 8px 0 + margin: 0 + a.alert-cta + &, & * + @include csstrans + color: #333 + &:hover, &:active, &:focus + &, & * + text-decoration: none + color: white \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/home_panes.css.sass b/app/assets/stylesheets/darkswarm/home_panes.css.sass index 6717af13a4..34db66291d 100644 --- a/app/assets/stylesheets/darkswarm/home_panes.css.sass +++ b/app/assets/stylesheets/darkswarm/home_panes.css.sass @@ -11,7 +11,7 @@ @include sidepaddingBg #brand-story.pane, #system.pane, #stats.pane - background-color: lighten($ofn-grey, 45%) + background-color: lighten($ofn-grey, 44%) #cta.pane background-image: url("/assets/tile-wide.png") diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 13741fe259..e36a07b4d2 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -62,7 +62,8 @@ small, .small .brick color: $clr-brick - +.hr-light + border-color: rgba(#ddd, 0.25) h1, h2, h3, h4, h5, h6 @include headingFont diff --git a/app/views/home/_brandstory.html.haml b/app/views/home/_brandstory.html.haml index e5aa05a0cb..494dcd3e9c 100644 --- a/app/views/home/_brandstory.html.haml +++ b/app/views/home/_brandstory.html.haml @@ -3,7 +3,7 @@ .small-12.columns.text-center %p Sometimes the best way to fix the system is to start a new one… - .hide-show + .hide-show{"ng-show" => "brandstory_expanded"} %p We begin from the ground up. With farmers and growers ready to tell their stories proudly and truly. With distributors ready to connect people with products fairly and honestly. With buyers who believe that better weekly shopping decisions can seriously change the world. %p Then we need a way to make it real. A way to empower everyone who grows, sells and buys food. A way to tell all the stories, to handle all the logistics. A way to turn transaction into transformation every day. %p So we build an online marketplace that levels the playing field. It’s transparent, so it creates real relationships. It’s open source, so it‘s owned by everyone. It scales to regions and nations, so people start versions across the world. @@ -12,7 +12,8 @@ %strong We call it Open Food Network. %p We all love food. Now we can love our food system too. - %a.button.small.neutral-btn.dark{href: "/"} + %a.button.small.neutral-btn.dark{"ng-click" => "toggle_brandstory()"} + // TODO: needs to toogle to show/hide brandstory Read more %i.ofn-i_052-point-down diff --git a/app/views/home/_cta1.html.haml b/app/views/home/_cta1.html.haml index 2bc92e58e2..9ce00d5730 100644 --- a/app/views/home/_cta1.html.haml +++ b/app/views/home/_cta1.html.haml @@ -4,5 +4,5 @@ %h3 Ready to change the world? %br %a.button.primary{href: "/shops"} - %i.ofn-i_029-shopping-basket - Shop now \ No newline at end of file + Shop now + %i.ofn-i_054-point-right \ No newline at end of file diff --git a/app/views/home/_cta2.html.haml b/app/views/home/_cta2.html.haml index 3b5561dba0..a44b03b572 100644 --- a/app/views/home/_cta2.html.haml +++ b/app/views/home/_cta2.html.haml @@ -4,5 +4,5 @@ %h3 It's fun and super easy %br %a.button.primary{href: "/shops"} - %i.ofn-i_029-shopping-basket - Shop now \ No newline at end of file + Shop now + %i.ofn-i_054-point-right \ No newline at end of file diff --git a/app/views/home/_stats.html.haml b/app/views/home/_stats.html.haml index bd2513d870..8d542557db 100644 --- a/app/views/home/_stats.html.haml +++ b/app/views/home/_stats.html.haml @@ -14,7 +14,7 @@ %hr %h5 %strong 345 - farmers & producers + producers %hr %h5 %strong 6,305 diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index fdb25371b0..9905064cd6 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -34,6 +34,7 @@ .off-canvas-wrap{offcanvas: true} .inner-wrap + = render partial: "shared/menu/alert" = render partial: "shared/menu/menu" %section{ role: "main" } diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index fff7e46fd2..4089832a03 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -1,62 +1,134 @@ %footer - .row + .ofn-global + .row + .small-12.columns.text-center + .logo + %img{src: "/assets/logo-global-white.png", width: "120px"} + .row + .small-12.medium-8.medium-offset-2.columns.text-center + .alert-box + %a.big-alert{href: "http://www.openfoodnetwork.org", target: "_blank"} + %h6 + Interested in joining the Open Food Network?   + %strong Start here + %i.ofn-i_054-point-right + .row + .small-12.medium-4.medium-offset-2.columns.text-center + %h6 OFN Global + %p + %a{href: "http://www.openfoodnetwork.org", target: "_blank"} Home + %span | + %a{href: "http://www.openfoodnetwork.org/news/", target: "_blank"} News + %span | + %a{href: "http://www.openfoodnetwork.org/about/", target: "_blank"} About + %span | + %a{href: "http://www.openfoodnetwork.org/contact/", target: "_blank"} Contact - .row.landing-page-row - .small-12.medium-4.columns.text-left - %h4 Email us - %p - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} - %span.email - = "hello@openfoodnetwork.org".reverse - %h4 Follow us - %p - %a{title:'Follow us on Facebook', href: 'https://www.facebook.com/OpenFoodNet', target: '_blank'} - %i.ofn-i_044-facebook - Facebook    - %a{title:'Follow us on Twitter', href: 'https://twitter.com/OpenFoodNet', target: '_blank'} - %i.ofn-i_041-twitter - Twitter    - %a{title:'Join our group on LinkedIn', href: 'http://www.linkedin.com/groups/Open-Food-Foundation-4743336', target: '_blank'} - %i.ofn-i_042-linkedin - LinkedIn - .small-12.medium-3.columns.text-left - %h4 Getting around - %ul.bullet-list - %li - %a{href: "/shop"} Shop - %li + + .small-12.medium-4.columns.text-center + %h6 OFN Sites + %p + %a{href: "http://dev.openfoodnetwork.org", target: "_blank"} Developer + %span | + %a{href: "http://community.openfoodnetwork.org", target: "_blank"} Community + %span | + %a{href: "http://www.openfoodnetwork.org/platform/user-guide/", target: "_blank"} User Guide + + .medium-2.columns.text-center + / Placeholder + + .ofn-local + + .row + .small-12.medium-8.medium-offset-2.columns.text-center + %p.secure-icon + %i.ofn-i_017-locked + %p.text-big.secure-text Secure and trusted. + %p.secure-text Open Food Network uses ... (description of SSL and security measures goes here). Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet, sem nec pulvinar sodales, dolor elit condimentum est. + %hr.hr-light + %br + + .row + .small-6.medium-3.medium-offset-2.columns.text-left + %h4 Keep in touch + %p.social-icons + %a{href: "/"} + %i.ofn-i_044-facebook + %a{href: "/"} + %i.ofn-i_041-twitter + %a{href: "/"} + %i.ofn-i_043-instagram + %a{href: "/"} + %i.ofn-i_042-linkedin + %a{href: "/"} + %i.ofn-i_046-g + %a{href: "/"} + %i.ofn-i_045-pintrest + %p + %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} Email us + %p + %a{href: "/"} Newsletter sign-up + %p + %a{href: "/"} Blog + %p + %a{href: "/"} Calendar + + + .small-6.medium-3.columns.text-left + %h4 Navigate + %p + %a{href: "/shops"} Shops + %p %a{href: "/map"} Map - %li + %p %a{href: "/producers"} Producers - %li + %p %a{href: "/groups"} Groups - .small-12.medium-2.columns.text-left - %h4 Producers - %p - = t :producers_join - %p - %a{href: "/register"} Register now - .small-12.medium-3.columns.text-left - %h4 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.pad-top - %hr - %h5.pad-top - %a{title: 'Open Food Network', href:'http://www.openfoodnetwork.org', target: '_blank' } openfoodnetwork.org - %br - © Copyright - = Date.today.year - Open Food Foundation - %p - %small - %a{href:"https://creativecommons.org/licenses/by-sa/3.0/", target: "_blank" } Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) - %p - %small - %a{href:"/Terms-of-service.pdf", target: "_blank" } Site terms & conditions - | - %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank" } Open Source & developer info on GitHub + %p + %a{href: "/about"} About + + .small-12.medium-2.columns.text-left + %h4 Join us + %p + %a{href: "/producers/signup"} Producers sign-up + %p + %a{href: "/shops/signup"} Hubs sign-up + + .medium-2.columns.text-center + / Placeholder + + + + .row + .small-12.medium-8.medium-offset-2.columns.text-center + %hr.hr-light + %br + + .row + .small-12.medium-3.medium-offset-2.columns.text-left + %a{href: root_path} + %img{src: "/assets/logo-color.png", srcset: "/assets/logo-color.svg", width: "220px"} + .small-12.medium-5.columns.text-left + %p.text-small + Read our + %a{href: "/Terms-of-service.pdf"} Terms & conditions + | + Find us on + %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank"} Github + %p.text-small + Open Food Network is a free and opensource software platform. Read about how the licence works at + %a{href:"https://creativecommons.org/licenses/by-sa/3.0/", target: "_blank" } Creative Commons + / Creative Commons Attribution-ShareAlike 3 + + + .medium-2.columns.text-center + / Placeholder + + + / .row + / .small-12.columns.text-center.pad-top + / © Copyright + / = Date.today.year + / Open Food Foundation + - // To be added when Guy's pretty landing page is up: - //| - //%a{href:'' } Developers diff --git a/app/views/shared/menu/_alert.html.haml b/app/views/shared/menu/_alert.html.haml new file mode 100644 index 0000000000..1aa4dcb049 --- /dev/null +++ b/app/views/shared/menu/_alert.html.haml @@ -0,0 +1,8 @@ +.text-center.home-alert + .alert-box + %a.alert-cta{href: "http://www.openfoodnetwork.org", target: "_blank"} + %h6 + Interested in joining the Open Food Network?   + %strong Start here + %i.ofn-i_054-point-right + %a.close{href: "#{}"} × \ No newline at end of file