Starting to prettify with Laura

This commit is contained in:
Will Marshall
2014-04-22 15:46:14 +10:00
parent fb072ad1a5
commit 8b7d2641f9
11 changed files with 91 additions and 64 deletions

View File

@@ -0,0 +1,9 @@
@import 'branding'
.active_table
margin: 2em 0em
.active_table_row
padding: 0.8em 0.5em
&:hover, &:active, &:focus
background: white
border: 1px solid $clr-strong

View File

@@ -0,0 +1,3 @@
$clr-strong: #8f1d45
$clr-soft: #f5e1e8
$clr-bright: #c23e6c

View File

@@ -1,12 +0,0 @@
#hubs hub
border: 1px solid transparent
display: block
& > .row
//padding-top: 12px
//padding-bottom: 12px
&, & > a.row
display: block
&.open
border: 1px solid pink
a.row .columns
border-bottom: 1px solid pink

View File

@@ -0,0 +1,12 @@
hub.active_table_row // Inherits from active_table
border: 1px solid transparent
display: block
& > .row
//padding-top: 12px
//padding-bottom: 12px
&, & > a.row
display: block
&.open
border: 1px solid pink
a.row .columns
border-bottom: 1px solid pink

View File

@@ -0,0 +1,6 @@
@import 'mixins'
#hub-search
.advanced
padding-top: 8px
@include disabled

View File

@@ -6,3 +6,6 @@
@extend .avenir
padding: 18px
margin-bottom: 1.25em
@mixin disabled
color: #ccc

View File

@@ -61,7 +61,7 @@ product
select
width: 280px
display: inline-block
background: transparent
vackground: transparent
border-width: 2px
border-color: #666666
font-size: 1em

View File

@@ -0,0 +1,7 @@
#tagline
background: grey
height: 400px
padding: 40px 0px
h1, h2, p
color: white

View File

@@ -1,68 +1,66 @@
%div#image-url-container{backstretch: true,
"background-url" => "#{LandingPageImage.random.andand.photo.andand.url(:max_common_res)}" }
#tagline
.row
.large-10.large-centered.columns
#postcode_select_box
.row
.large-12.columns
#logo-container= image_tag "ofn_logo.png"
.row
.large-12.large-centered.columns
= link_to about_us_path do
%strong
%i What is open food network?
.small-12.text-center.columns
%h1 Open Food Network
%h2 An open marketplace that makes it easy to find, buy, sell and move sustainable local food.
%a Learn more (modal)
.row
.large-12.columns.text-center
%h2 Ready to shop?
%p Select a food hub from the list below:
#hubs{"ng-controller" => "HubsCtrl"}
:javascript
angular.module('Darkswarm').value('hubs', #{render "shared/hubs"})
.row
.large-9.columns
%input{type: :text, "ng-model" => "query",
.small-12.columns.text-center
%h1 Ready to shop?
%p
Select a
%a food hub (modal)
from the list below:
#hub-search.row
.small-9.columns
%input{type: :text,
"ng-model" => "query",
placeholder: "Search postcode, suburb or hub name...",
"ng-debounce" => "150",
"ofn-disable-enter" => true}
.large-3.columns
.small-3.columns.advanced
Advanced search
.row{bindonce: true}
.large-12.columns
%hub{"ng-repeat" => "hub in filteredHubs = (hubs | filterHubs:query)",
"ng-class" => "{'open' : open}"}
%a.row{"ng-click" => "open = !open"}
.columns.large-4
%strong {{ hub.name }}
.columns.large-3
{{ hub.address.city }}
.columns.large-1
{{ hub.address.state }}
.columns.large-3
Orders closing when?
.columns.large-1
%i{"ng-class" => "{'fi-arrow-down' : !open, 'fi-arrow-up' : open}"}
.row{"ng-if" => "open"}
.columns.large-4
%strong Shop for
.columns.large-4
%strong Delivery options
.pickup{"bo-if" => "hub.pickup"} Pickup
.delivery{"bo-if" => "hub.delivery"} Delivery
.columns.large-4
%strong Our producers
.row{"ng-if" => "open"}
.columns.large-12
%a{"bo-href" => "hub.path"}
Shop at
.small-12.columns
.active_table
%hub.active_table_row{"ng-repeat" => "hub in filteredHubs = (hubs | filterHubs:query)",
"ng-class" => "{'open' : open}"}
%a.row{"ng-click" => "open = !open"}
.columns.small-4
%strong {{ hub.name }}
.columns.small-3
{{ hub.address.city }}
.columns.small-1
{{ hub.address.state }}
.columns.small-3
Orders closing when?
.columns.small-1
%i{"ng-class" => "{'fi-arrow-down' : !open, 'fi-arrow-up' : open}"}
.large-12.columns
.row{"ng-if" => "open"}
.columns.small-4
%strong Shop for
.columns.small-4
%strong Delivery options
.pickup{"bo-if" => "hub.pickup"} Pickup
.delivery{"bo-if" => "hub.delivery"} Delivery
.columns.small-4
%strong Our producers
.row{"ng-if" => "open"}
.columns.small-12
%a{"bo-href" => "hub.path"}
Shop at
%strong {{ hub.name }}
.small-12.columns
.row{"ng-show" => "filteredHubs.length == 0"}
.columns.large-12.text-center
.columns.small-12.text-center
No results

View File

@@ -9,6 +9,7 @@
= stylesheet_link_tag "darkswarm/all"
= javascript_include_tag "darkswarm/all"
= render "layouts/bugherd_script"
= csrf_meta_tags

View File

@@ -31,4 +31,4 @@ staging:
database: open_food_network_prod
pool: 5
username: ofn
password: f00d
password: f00d