96 Commits

Author	SHA1	Message	Date
summerscope	ddde4e9dcb	WIP producers signup page markup	2015-05-02 18:25:23 +10:00
summerscope	fd90da6868	Shops landing page - adding info pane and copy with Jay.	2015-05-02 16:02:18 +10:00
summerscope	427f535026	Redesign big chunk of work: ... > setting up pages for Shops, and shops signup, producers signup > setting up routes for new pages > changing fonts to Google Oswald & Roboto > setting up homepage partials and removing partials no longer required > changing menu links and labels	2015-04-30 18:20:17 +10:00
Rob Harrington	6a4de7c7e2	Hiding filters on list views because styling is broken	2015-04-24 19:35:18 +10:00
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rob Harrington	067b814daa	Making legacy filters work properly with filter-selector directive	2015-03-05 18:29:12 +11:00
Rob Harrington	e7854bcd8e	Moving single line selectors to template, making sure other users of taxons-selector still work	2015-03-05 16:38:21 +11:00
Maikel Linke	0fdf313424	Fixing img display of producers if no logo present	2015-02-12 10:31:13 +11:00
summerscope	f36c881f52	Add clear filters feature to Producers page	2014-12-19 13:02:07 +11:00
Rafael Schouten	1150e69500	fix visible bug	2014-10-17 03:59:48 +11:00
Rafael Schouten	c5afd8cebf	move visible filter to pages, and use category	2014-10-16 16:26:50 +11:00
Rafael Schouten	ec6805f573	use shared partial for no results	2014-10-06 23:51:19 +11:00
Rafael Schouten	62f7114fa1	Merge branch 'cleanup' into migrate_ent_types ... Conflicts: app/views/home/_hubs.html.haml	2014-10-02 10:02:08 +10:00
Rafael Schouten	47dc001735	merge has_shopfront and is_distibutor	2014-10-01 20:27:53 +10:00
Rafael Schouten	04c5dff497	fixup merge	2014-09-25 19:47:00 +10:00
Rafael Schouten	55f4415c0d	Merge branch 'master' into cleanup ... Conflicts: app/assets/javascripts/darkswarm/services/hubs.js.coffee app/views/home/_hubs.html.haml app/views/producers/_filters.html.haml app/views/producers/index.html.haml	2014-09-25 19:42:20 +10:00
Rob Harrington	33dff551c7	Removing 'show profiles' from producer and shop pages	2014-09-25 17:19:57 +10:00
Rafael Schouten	096324cf5e	bugfix filters	2014-09-25 13:46:08 +10:00
Rafael Schouten	0e2774882f	dry enterprise angular	2014-09-25 13:06:02 +10:00
Rafael Schouten	3775cd29cb	generalise search filter to any enterprise	2014-09-25 11:34:49 +10:00
Rafael Schouten	abc5a215a2	add map modals, profile filters and bugfixes	2014-09-19 17:07:07 +10:00
summerscope	9a4ba5aa1f	Producer page styling and logic for markup	2014-09-18 16:15:14 +10:00
summerscope	7f4bccc956	fix anchor angular for link to hub shopfront	2014-09-18 15:22:53 +10:00
summerscope	c42f83b6b1	Tweak markup to show producer name and write logic for link around producer if also own shopfront	2014-09-18 15:13:48 +10:00
Rafael Schouten	d75076e1c9	producer icons and inital link logic	2014-09-18 13:59:47 +10:00
summerscope	c365047d0c	Short description goes back in producer fat view until we can clean up the HTML formatting	2014-09-12 15:40:12 +10:00
summerscope	bfa71942fe	Tweaks to input placeholder label	2014-09-12 11:02:28 +10:00
summerscope	6271b83fad	Tweak placeholder messages for big inputs	2014-09-05 18:07:28 +10:00
summerscope	778cf0326b	Changing placeholder for	2014-09-05 18:04:02 +10:00
summerscope	ab44046658	skinny view producers remove unnecessary spacer element	2014-09-05 17:52:36 +10:00
summerscope	a9619a6dca	Changes to markup on producer page to adjust layout	2014-09-05 17:50:50 +10:00
summerscope	60ac3f29a5	Producers page WIP	2014-09-05 16:41:00 +10:00
summerscope	0d0ffa1cd0	Making CTA links consistent with modals, adding in logic to force space holding for producer fat view	2014-09-05 15:47:41 +10:00
Will Marshall	e8045cac42	Renaming to state_name	2014-07-31 11:36:53 +10:00
summerscope	33b7df596b	Use a consistent naming convention for hubs and producers on css class skinny-head	2014-07-28 15:03:49 +10:00
summerscope	78ac55418c	Tweak producers for responsive views,	2014-07-28 13:51:43 +10:00
summerscope	23182a9026	Grid system layout for filter buttons for all sizes and breakpoints	2014-07-11 13:10:22 +10:00
Will Marshall	190e320bad	Pulling some structure out of directives	2014-07-11 12:45:08 +10:00
Will Marshall	932ca95ec5	Sorting hubs by active	2014-07-10 13:04:45 +10:00
summerscope	c8f51ec917	Adjust layout for small views	2014-07-10 12:21:32 +10:00
Will Marshall	8296a4131e	Partializing filter controls	2014-07-10 12:07:21 +10:00
summerscope	3e24e43100	Tweak icons for up / down	2014-07-10 12:05:49 +10:00
Will Marshall	409d647f62	Fixing up hubs page	2014-07-10 11:38:17 +10:00
summerscope	2c157a939d	Tweak markup / filters available for Producers page	2014-07-09 17:24:24 +10:00
summerscope	eda5119bfc	Remove unused styling and unneeded comments	2014-07-09 16:57:33 +10:00
summerscope	0451dbe6b0	More styling to filters and search	2014-07-09 16:55:05 +10:00
summerscope	9474ec49c6	Fix unbalanced brackets issue	2014-07-09 16:21:36 +10:00
summerscope	9587b2a2ed	Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will ... Conflicts: app/views/producers/_filters.html.haml	2014-07-09 16:18:41 +10:00
summerscope	263060611d	Search and filter styling and markup tweaks	2014-07-09 16:13:43 +10:00
Will Marshall	c8ee4a594c	Some text changes and similar magic	2014-07-09 16:10:08 +10:00