diff --git a/app/assets/images/groups.svg b/app/assets/images/groups.svg index f4ca32ec27..a2e353d47f 100644 --- a/app/assets/images/groups.svg +++ b/app/assets/images/groups.svg @@ -1,1565 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/assets/images/home/home.jpg b/app/assets/images/home/home.jpg index b4b152edd2..af5f9e0e46 100644 Binary files a/app/assets/images/home/home.jpg and b/app/assets/images/home/home.jpg differ diff --git a/app/assets/images/home/home2.jpg b/app/assets/images/home/home2.jpg new file mode 100644 index 0000000000..c89a3b6a16 Binary files /dev/null and b/app/assets/images/home/home2.jpg differ diff --git a/app/assets/images/home/home3.jpg b/app/assets/images/home/home3.jpg new file mode 100644 index 0000000000..44fec12a59 Binary files /dev/null and b/app/assets/images/home/home3.jpg differ diff --git a/app/assets/images/hubs-bg.jpg b/app/assets/images/hubs-bg.jpg new file mode 100644 index 0000000000..2d1c49e230 Binary files /dev/null and b/app/assets/images/hubs-bg.jpg differ diff --git a/app/assets/images/logo-color.png b/app/assets/images/logo-color.png index a9a7ccf881..81e4829758 100644 Binary files a/app/assets/images/logo-color.png and b/app/assets/images/logo-color.png differ diff --git a/app/assets/images/logo-color.svg b/app/assets/images/logo-color.svg index f2faf8ca1c..84de1b4ceb 100644 --- a/app/assets/images/logo-color.svg +++ b/app/assets/images/logo-color.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/producers.svg b/app/assets/images/producers.svg new file mode 100644 index 0000000000..9804557f4b --- /dev/null +++ b/app/assets/images/producers.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass index 931b7470a6..97b984eb34 100644 --- a/app/assets/stylesheets/darkswarm/groups.css.sass +++ b/app/assets/stylesheets/darkswarm/groups.css.sass @@ -4,10 +4,13 @@ // Search page #groups - background-color: $clr-brick-light + background-color: lighten($clr-brick, 56%) background-image: url("/assets/groups.svg") - background-position: center 15px + background-position: center 50px background-repeat: no-repeat + background-size: 922px 922px + @include sidepaddingSm + @include panepadding a > .group-name &:hover, &:focus, &:active text-decoration: underline diff --git a/app/assets/stylesheets/darkswarm/home_panes.css.sass b/app/assets/stylesheets/darkswarm/home_panes.css.sass index d4e8dddc32..25ac4fe9dc 100644 --- a/app/assets/stylesheets/darkswarm/home_panes.css.sass +++ b/app/assets/stylesheets/darkswarm/home_panes.css.sass @@ -5,18 +5,18 @@ // Styling for big panes on homepage - #panes .pane .row @include panepadding - // @include sidepaddingBg #brand-story.pane, #system.pane, #stats.pane background-color: lighten($ofn-grey, 44%) #cta.pane, #shops.pane, #producer-signup.pane, #shops-signup.pane background-image: url("/assets/tile-wide.png") + background-color: white + background-size: 2140px, 380px background-position: center center #brand-story.pane @@ -35,7 +35,6 @@ font-weight: 300 text-transform: uppercase margin: 1.5rem 0 - // border-bottom: 2px solid lighten($ofn-grey, 34%) display: inline-block strong color: $clr-brick @@ -72,7 +71,7 @@ padding-bottom: 0.25rem #shops.pane - background-color: lighten($clr-brick, 30%) + background-color: lighten($clr-brick, 26%) &, & * color: white @@ -81,11 +80,20 @@ font-weight: 300 font-size: 3rem +.cta.cta-producers.pane + @include fullwidthbg + background-image: url("/assets/producers/producers-pg-bg.jpg") + &, & * + white + +.cta.cta-hubs.pane + @include fullwidthbg + background-image: url("/assets/hubs-bg.jpg") + #producer-signup.pane, #shops-signup.pane - background-color: lighten($clr-turquoise, 12%) + background-color: lighten($clr-turquoise, 10%) &, h1, h2, h3, h4, h5, h6, p color: white - h2 color: white font-weight: 300 @@ -114,7 +122,7 @@ background-color: lighten($ofn-grey, 44%) #shops-signup.pane - background-color: lighten($clr-brick, 30%) + background-color: lighten($clr-brick, 26%) #producer-case-studies, #shops-case-studies padding-top: 100px diff --git a/app/assets/stylesheets/darkswarm/home_tagline.css.sass b/app/assets/stylesheets/darkswarm/home_tagline.css.sass index 57ebd06a94..0b54124869 100644 --- a/app/assets/stylesheets/darkswarm/home_tagline.css.sass +++ b/app/assets/stylesheets/darkswarm/home_tagline.css.sass @@ -4,10 +4,25 @@ // Styling for brand intro / tagline on homepage #tagline - background-color: $dark-grey - background-image: url("/assets/home/home.jpg") - @include fullbg - height: 440px - padding: 40px 0px + width: 100% + height: 500px + -webkit-box-shadow: inset 0 0 150px 0 rgba(0,0,0,0.75) + -moz-box-shadow: inset 0 0 150px 0 rgba(0,0,0,0.75) + box-shadow: inset 0 0 150px 0 rgba(0,0,0,0.75) + &:before + content: "" + @include fullbg + background-color: black + background-image: url("/assets/home/home.jpg") + -webkit-filter: brightness(0.6) contrast(80%) + filter: brightness(0.6) contrast(80%) + padding: 40px 0px + width: 100% + height: 500px + position: fixed + left: 0 + right: 0 + z-index: -1 + h1 - margin-top: 6rem \ No newline at end of file + margin-top: 10rem diff --git a/app/assets/stylesheets/darkswarm/producers.css.sass b/app/assets/stylesheets/darkswarm/producers.css.sass index 81b176f0ff..2055a45035 100644 --- a/app/assets/stylesheets/darkswarm/producers.css.sass +++ b/app/assets/stylesheets/darkswarm/producers.css.sass @@ -2,7 +2,11 @@ @import mixins .producers - background-color: lighten($ofn-grey, 43%) + background-color: lighten($clr-turquoise, 68%) + background-image: url("/assets/producers.svg") + background-position: center 50px + background-repeat: no-repeat + background-size: 922px 763px @include sidepaddingSm @include panepadding a diff --git a/app/views/producers/signup.html.haml b/app/views/producers/signup.html.haml index ac295da343..3d5589c656 100644 --- a/app/views/producers/signup.html.haml +++ b/app/views/producers/signup.html.haml @@ -3,13 +3,13 @@ .row .small-12.medium-6.medium-offset-3.columns.text-center %h2 Food producers, unstoppable. - %p.text-big Some nice warm intro text. If you're not sure yet, why would you want to be part of OFN Australia? All the warm fuzzies go here. - %br - %hr - %br + %p.text-big Sell your food and tell your stories to diverse new markets. Save time and money on every overhead. We support innovation without the risk. We've levelled the playing field. + .cta.cta-producers.pane + .row + .small-12.medium-6.medium-offset-3.columns.text-center %h4 Ready to join OFN Australia? %p.text-big Start by creating your profile: - %a.neutral-btn.light{href: "/register"} + %a.neutral-btn.dark{href: "/register"} Join now %i.ofn-i_054-point-right .pane diff --git a/app/views/shops/signup.html.haml b/app/views/shops/signup.html.haml index ddddc61e5f..072f9da730 100644 --- a/app/views/shops/signup.html.haml +++ b/app/views/shops/signup.html.haml @@ -4,12 +4,12 @@ .small-12.medium-6.medium-offset-3.columns.text-center %h2 Food hubs, unlimited. %p.text-big Whatever your model, we support you. However you change, we're with you. We're non-profit, independent, and open-sourced. We're the software partners you've dreamed of. - %br - %hr - %br + .cta.cta-hubs.pane + .row + .small-12.medium-6.medium-offset-3.columns.text-center %h4 Ready to join OFN Australia? %p.text-big Start by creating your profile: - %a.neutral-btn.light{href: "/register"} + %a.neutral-btn.dark{href: "/register"} Join now %i.ofn-i_054-point-right .pane