raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-17 04:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'laura_and_will'

Browse Source
This commit is contained in:
Will Marshall
2014-06-19 21:29:15 +10:00
parent f8da754372 c141707ef6
commit bffe036990
7 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/templates/map_modal_hub.html.haml
View File

@@ -36,7 +36,7 @@
%i.ofn-i_039-delivery
Delivery
.row
.small-12.large-12.columns
.columns.small-12
%a.button.hub.expand{"bo-href" => "enterprise.path",
"ng-class" => "{primary: enterprise.active, secondary: !enterprise.active}",
"ofn-empties-cart" => "enterprise"}

24
app/assets/stylesheets/darkswarm/active_table.css.sass
View File

@@ -20,6 +20,9 @@
border: 1px solid transparent
&, & > a.row
display: block
.active_table_row.link
border: 0
&.open
.active_table_row:first-child
@@ -38,24 +41,25 @@
.active_table_row:nth-child(2)
border-left: 1px solid $dark-grey
border-right: 1px solid $dark-grey
border-bottom: 1px solid $dark-grey
border-top: none
background-color: rgba(255,255,255,0.2)
.active_table_row.link
@include csstrans
padding: 0
background-color: $dark-grey
-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35)
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.35)
&:hover
background-color: $disabled-dark
a
display: block
padding: 0.8em 0.5em
margin: 0 -0.9375rem
&, & *
color: white
border-left: 1px solid $dark-grey
border-right: 1px solid $dark-grey
border-bottom: 1px solid $dark-grey
// &:hover
// background-color: $disabled-dark
// a
// display: block
// padding: 0.8em 0.5em
// margin: 0 -0.9375rem
// &, & *
// color: white
p
padding-top: 1em

10
app/assets/stylesheets/darkswarm/hub_node.css.sass
View File

@@ -27,7 +27,7 @@
border-left: 1px solid $disabled-dark
border-right: 1px solid $disabled-dark
border-bottom: 1px solid $disabled-dark
//Closed row
&.closed
&:hover, &:active, &:focus
@@ -47,11 +47,11 @@
.active_table_row:nth-child(2)
border-left: 1px solid $clr-brick
border-right: 1px solid $clr-brick
border-bottom: 1px solid $clr-brick
.active_table_row.link
background-color: $clr-brick
&:hover
background-color: $clr-brick-bright
border-left: 1px solid $clr-brick
border-right: 1px solid $clr-brick
border-bottom: 1px solid $clr-brick
//Current selected row
&.current

8
app/assets/stylesheets/darkswarm/modal-enterprises.css.sass
View File

@@ -87,8 +87,12 @@
float: left
margin-right: 0.5rem
.active_table_row
.cta-container
padding-bottom: 0.75rem
padding-top: 0.5rem
.button.hub
margin-bottom: 0.25rem
// Generic styles for use

7
app/assets/stylesheets/darkswarm/producer_node.css.sass
View File

@@ -16,11 +16,10 @@
.active_table_row:nth-child(2)
border-left: 1px solid $clr-turquoise
border-right: 1px solid $clr-turquoise
border-bottom: 1px solid $clr-turquoise
.active_table_row.link
background-color: $clr-turquoise
&:hover
background-color: $clr-turquoise-bright
border-left: 1px solid $clr-turquoise
border-right: 1px solid $clr-turquoise
border-bottom: 1px solid $clr-turquoise
//Closed row
&.closed

28
app/views/home/_fat.html.haml
View File

@@ -25,16 +25,18 @@
= render partial: "modals/producer"
.row.active_table_row.link{"ng-show" => "open()", "bo-if" => "hub.active"}
.columns.small-11
%span{"active-table-hub-link" => "hub", change: "Change hub to", shop: "Shop at"}
%a.button.hub{"bo-href" => "hub.path", "ofn-empties-cart" => "hub",
"bo-class" => "{primary: hub.active, grey: !hub.active}"}
%i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
{{hub.name}}
( {{ hub.address.city }} , {{hub.address.state}} )
.columns.small-1.text-right
%a{"bo-href" => "hub.path"}
%i.ofn-i_007-caret-right
.cta-container.columns.small-12
.row
.columns.small-12
%h5
%span{"active-table-hub-link" => "hub", change: "Change hub to", shop: "Shop at"}
.row
.columns.small-12
%a.button.hub.expand{"bo-href" => "hub.path",
"ng-class" => "{primary: hub.active, secondary: !hub.active}",
"ofn-empties-cart" => "hub"}
%i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
{{hub.name}}
.button-address ({{ [hub.address.city, hub.address.state] | printArray }})
%i.ofn-i_007-caret-right

2
app/views/producers/_fat.html.haml
View File

@@ -14,7 +14,7 @@
%a{"ng-repeat" => "hub in producer.hubs",
"bo-href" => "hub.path", "ofn-empties-cart" => "hub",
"bo-class" => "{primary: hub.active, grey: !hub.active}"}
"bo-class" => "{primary: hub.active, secondary: !hub.active}"}
%i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
{{hub.name}}