31 Commits

Author	SHA1	Message	Date
Rafael Schouten	47dc001735	merge has_shopfront and is_distibutor	2014-10-01 20:27:53 +10:00
summerscope	237d129710	Changing the markup to give a class where is a producer	2014-09-26 15:01:23 +10:00
summerscope	5e4e939087	Return template markup which was accidentally removed in Rafs merge	2014-09-19 17:47:49 +10:00
Rafael Schouten	559d3b0e4b	fixup the header but needs some styling	2014-09-19 17:24:41 +10:00
Rafael Schouten	883e5f1095	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend ... Conflicts: app/assets/javascripts/templates/partials/enterprise_header.html.haml	2014-09-19 17:22:29 +10:00
Rafael Schouten	abc5a215a2	add map modals, profile filters and bugfixes	2014-09-19 17:07:07 +10:00
summerscope	5a7175e75d	Tweak markup to make modals fit headers nicely across small sizes	2014-09-19 16:43:31 +10:00
summerscope	4c7fa4eb9f	Fix markup so that text is not nested inside icon markup	2014-09-19 15:19:47 +10:00
Rafael Schouten	0d5106d571	refactor enterprise type logic and fix icons	2014-09-18 18:15:28 +10:00
Rafael Schouten	bd922085c4	icons and entity category logic	2014-09-18 15:14:55 +10:00
summerscope	3cff83b7a5	Kill the outside modal close button styling once and for all	2014-09-12 14:42:58 +10:00
Rob H	097367a9f8	Map modals for 'profile' enterprises do not display shopping options	2014-09-05 16:28:08 +10:00
summerscope	94fbb624f5	Make CTA links separate from hub link styling	2014-09-05 12:14:55 +10:00
summerscope	116eb6a2c6	template updates for modals - links not buttons	2014-09-05 11:38:19 +10:00
summerscope	7f6a7b4254	Adding underlines to links on modals for map view etc to try and make these more intuitive and usable	2014-08-15 11:02:21 +10:00
Rohan Mitchell	f8c71ced45	Fix display of state_name, after attribute was renamed in serializer	2014-08-07 16:46:57 +10:00
summerscope	c2540234f1	Add class to force word wrap	2014-08-07 16:18:02 +10:00
summerscope	c6a350af75	Better column layout for responsive	2014-08-07 15:22:38 +10:00
Will Marshall	c4f7c1af60	Lots of small bug fixes, changing image sizes	2014-07-29 11:33:25 +10:00
summerscope	3d472bc57e	Make the header styles consistent for the modals	2014-07-28 16:14:01 +10:00
Will Marshall	4f3d468db6	Dereferencing groups and adding modals to page	2014-06-24 17:15:31 +10:00
Will Marshall	c09555e380	Tab fixes, new tests, reworking modals	2014-06-24 17:15:31 +10:00
Will Marshall	b3f0cb1e74	Bunch of minor bugfixes	2014-06-24 17:14:01 +10:00
Will Marshall	21589fd5b0	Hack patching home page modals	2014-06-20 16:31:49 +10:00
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
summerscope	4c160ac83f	Changing markup for CONTACT section of enterprise modal	2014-06-19 15:42:35 +10:00
summerscope	a74766909a	Adding a stylesheet specifically for enterprises e.g. hubs and producers	2014-06-19 15:42:34 +10:00
Will Marshall	58e810a736	Using enterprise in modals	2014-06-19 12:38:30 +10:00
summerscope	f89418c0d6	Update follow markup to reflect new design WIP commit	2014-06-18 18:52:29 +10:00
summerscope	54983845c4	Update contact markup to reflect new design	2014-06-18 18:52:07 +10:00
Will Marshall	f54834da01	Changing our composition of producers and hubs	2014-06-17 16:33:43 +10:00