raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend

Browse Source
This commit is contained in:
Rafael Schouten
2014-09-18 18:17:41 +10:00
parent 64fdbcf04f 9a4ba5aa1f
commit 527a139f72
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,11 @@
span
text-decoration: underline
&.has_shopfront, &.has_shopfront i.ofn-i_059-producer, &.has_shopfront i.ofn-i_060-producer-reversed
color: $clr-brick
&:hover, &:active, &:focus
color: $clr-brick-bright
a.cta-hub
&:hover, &:focus, &:active
&.secondary
@@ -51,9 +56,11 @@
.fat-taxons
background-color: $clr-turquoise-light
.producer-name
color: $clr-turquoise
//Open row
&.open
.active_table_row
border-left: 1px solid $clr-turquoise-bright
border-right: 1px solid $clr-turquoise-bright

4
app/views/producers/_skinny.html.haml
View File

@@ -1,11 +1,11 @@
.row.active_table_row{"ng-click" => "toggle()", "ng-class" => "{'closed' : !open(), 'has_shopfront' : producer.has_shopfront}"}
.columns.small-12.medium-4.large-4.skinny-head
%span{"bo-if" => "producer.has_shopfront" }
%a{"bo-href" => "producer.path" }
%a.has_shopfront{"bo-href" => "producer.path" }
%i{ng: {class: "producer.producer_icon_font"}}
%span.margin-top
%strong {{ producer.name }}
%span{"bo-if" => "!producer.has_shopfront" }
%span.producer-name{"bo-if" => "!producer.has_shopfront" }
%i{ng: {class: "producer.producer_icon_font"}}
%span.margin-top
%strong {{ producer.name }}

11
app/views/shared/components/_filter_controls.html.haml
View File

@@ -10,10 +10,7 @@
No filters
.small-12.medium-6.columns.text-right
.profile-checkbox
/ Hide until we're ready to work on this:
/ %input{type: "checkbox", name: "profile"}><
/ %label Show profiles
/ %button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but they may have their own physical or online shop elsewhere", "popover-placement" => "left"}><
/ %i.ofn-i_013-help
%input{type: "checkbox", name: "profile"}><
%label Show profiles
%button.button.secondary.tiny.help-btn.ng-scope{:popover => "Profiles do not have a shopfront on the Open Food Network, but do have their own physical or online shop elsewhere", "popover-placement" => "left"}><
%i.ofn-i_013-help