diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass index 3041817073..973538c147 100644 --- a/app/assets/stylesheets/darkswarm/footer.sass +++ b/app/assets/stylesheets/darkswarm/footer.sass @@ -3,10 +3,20 @@ footer background: $dark-grey + border-top: 1px dotted white @include panepadding .row &, & * color: white + a, a > i + @include csstrans + a, a * + color: $clr-brick-light-bright + &:hover, &:active, &:focus + color: $clr-brick-bright + @include textsoftpress + small + font-size: 0.75rem span.email direction: rtl unicode-bidi: bidi-override diff --git a/app/assets/stylesheets/darkswarm/home_tagline.css.sass b/app/assets/stylesheets/darkswarm/home_tagline.css.sass index 950a3c216d..aa369723ea 100644 --- a/app/assets/stylesheets/darkswarm/home_tagline.css.sass +++ b/app/assets/stylesheets/darkswarm/home_tagline.css.sass @@ -14,4 +14,7 @@ h2 font-size: 1.6875rem a - color: $clr-brick-bright \ No newline at end of file + color: $clr-brick-bright + &:hover, &:active, &:focus + color: $clr-brick-light-bright + @include textsoftpress \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index d675b1684d..7020a52e47 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -4,6 +4,9 @@ .inner-wrap padding-top: 45px +.top-bar + @include box-shadow(0 2px 3px 0 rgba(0,0,0,0.25)) + nav @include textpress .top-bar-section ul li > a diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index 7c29d476c3..193bf003c9 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -67,9 +67,18 @@ transition: all 100ms ease-in-out -webkit-transform-style: preserve-3d +@mixin box-shadow($box-shadow) + -moz-box-shadow: $box-shadow + -webkit-box-shadow: $box-shadow + box-shadow: $box-shadow + @mixin avenir font-family: "AvenirBla_IE", "AvenirBla" @mixin textpress text-shadow: 0 -1px 1px #111111, 0 1px 2px #222222 +@mixin textsoftpress + text-shadow: 0 0 3px rgba(0,0,0,0.35) + + diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 13d0ab1753..f16ea80bee 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -16,9 +16,9 @@ font-family: 'AvenirMed' src: url("/AvenirLTStd-Medium.otf") format("opentype") -//body - //font-family: "AvenirBla_IE", "AvenirBla" - +body + font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + a color: $clr-brick &:hover @@ -32,6 +32,19 @@ h1, h2, h3, h4, h5, h6, .avenir @include avenir padding: 0px +ul.ofn-list + margin-left: 0.5em + li + list-style: none + li:before + content: "\f112" + font-family: "foundation-icons" + display: inline-block + font-weight: normal + font-style: normal + font-variant: normal + text-transform: none + font-size: 80% .light-grey color: #666666 diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index 8c3d986811..2370b856f3 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -4,6 +4,7 @@ .neutral-btn @include button + font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif background-color: transparent border: 2px solid rgba(200, 200, 200, 1) color: #999 diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index eb655b7c37..c436e00bc2 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -1,7 +1,12 @@ %footer .row.landing-page-row - .small-5.columns.text-left - %h3 Follow us + .small-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.fi-social-facebook @@ -11,17 +16,36 @@ Twitter    %a{title:'Join our group on LinkedIn', href: 'http://www.linkedin.com/groups/Open-Food-Foundation-4743336', target: '_blank'} %i.fi-social-linkedin - LinkedIn    - %p - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} - %span.email - = "hello@openfoodnetwork.org".reverse - .small-2.columns - .small-5.columns.text-right - %h3 About us + LinkedIn + .small-4.columns.text-left + %h4 Getting around + %ul.ofn-list + %li + %a{href: ""} Shop + %li + %a{href: ""} Map + %li + %a{href: ""} Producers + %li + %a{href: ""} Groups + .small-4.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 %p - %p © Copyright 2014 Open Food Foundation - %small Content | Terms of Service | Code - Opensource on Github | Creative Commons / IP | OFN.org + %p + %hr + %h5 + %a{title: 'Open Food Network', href:'http://www.openfoodnetwork.org', target: '_blank' } openfoodnetwork.org + %br + %p + © Copyright 2014 Open Food Foundation + %small + %a{href:'' } Terms & conditions + | + %a{href:'' } Creative Commons + | + %a{href:'' } Github + | + %a{href:'' } Developers diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 38177b20ba..2dfcda5211 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -32,7 +32,7 @@ %li.divider %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.id"} %a{href: main_app.shop_path} - %em Shopping at: + %em Shopping @ %span.nav-primary.nav-branded {{ CurrentHub.name }} %li.divider %li.cart