1341 Commits

Author	SHA1	Message	Date
Rafael Schouten	3a14a26bc6	refactor wysiwyg	2014-10-01 16:07:10 +10:00
Rafael Schouten	726340fc86	configure textAngular on enterprise edit page	2014-09-30 18:20:45 +10:00
Rafael Schouten	823923f828	add textAngular javascript	2014-09-30 15:09:43 +10:00
summerscope	2ea0c89899	Style the modal headers	2014-09-26 15:01:23 +10:00
summerscope	237d129710	Changing the markup to give a class where is a producer	2014-09-26 15:01:23 +10:00
summerscope	dee503befb	Tweak language around the long description	2014-09-26 15:01:22 +10:00
summerscope	781fcae946	Change styling for register modals	2014-09-26 15:01:22 +10:00
Rob Harrington	b55b4e9a0c	Merge branch 'master' into ent_types_frontend	2014-09-25 17:20:15 +10:00
Rob Harrington	1e31dd88ee	Remove unrequired functions, add has_hub_listing	2014-09-25 17:19:57 +10:00
summerscope	cbc8a62686	STyling for profile only small view	2014-09-25 17:02:41 +10:00
summerscope	3b7cd6d329	Making the styling work for profiles and producers	2014-09-25 16:54:17 +10:00
summerscope	97ae170dd1	Add in profile only use case to styling	2014-09-25 16:40:06 +10:00
summerscope	3812d1eebb	Add more greys	2014-09-25 16:39:48 +10:00
Rob Harrington	f5849e91dc	Adding limit reached modal to registration	2014-09-25 12:25:32 +10:00
Rafael Schouten	da620f3723	Merge branch 'master' into ent_types_frontend	2014-09-25 10:09:42 +10:00
Rob Harrington	5bceb81479	Fixing image upload in onboarding	2014-09-19 23:37:02 +10:00
summerscope	d86c3cff26	Making enterprise header styles show as turquoise when no shopfront to click through to	2014-09-19 17:48:24 +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	919f87df58	change modal styling to improve look of Close button, overall layout for modals	2014-09-19 16:46:19 +10:00
summerscope	408f7b7f10	Modals styling refine for small use cases	2014-09-19 16:44:43 +10:00
summerscope	09cc3c6285	Styling for hero image underlay used on enterprises- adjust min heights for different text use cases	2014-09-19 16:44:16 +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
summerscope	e5fc3c19e3	Working on refining scroll on modals	2014-09-19 14:41:45 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	527a139f72	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend	2014-09-18 18:17:41 +10:00
Rafael Schouten	0d5106d571	refactor enterprise type logic and fix icons	2014-09-18 18:15:28 +10:00
summerscope	e1769e638d	More styling for producer page	2014-09-18 16:14:53 +10:00
summerscope	20a76626b9	Add styling for instance where producer is own shopwfront on producer page	2014-09-18 15:22:29 +10:00
Rafael Schouten	bd922085c4	icons and entity category logic	2014-09-18 15:14:55 +10:00
Rafael Schouten	01c98bf6e4	refactor and bugfix for tests	2014-09-17 01:07:34 +10:00
Rafael Schouten	1aa80e53b1	Merge branch 'master' into currency ... Conflicts: app/helpers/injection_helper.rb db/suburb_seeds.rb	2014-09-16 10:25:22 +10:00
summerscope	cc9d2ebbac	Modal styling fixes for scrolling on mobile view	2014-09-12 16:01:25 +10:00
summerscope	799bfae6e4	Revert "Add commented-out scrolling code. Return false from click handlers." ... This reverts commit dbefd43f07.	2014-09-12 15:51:20 +10:00
Rohan Mitchell	dbefd43f07	Add commented-out scrolling code. Return false from click handlers.	2014-09-12 15:33:02 +10:00
summerscope	42fccd1bdf	Merging master into my branch to make it up to date	2014-09-12 14:48:19 +10:00
summerscope	3cff83b7a5	Kill the outside modal close button styling once and for all	2014-09-12 14:42:58 +10:00
summerscope	0dd33e6635	Modal styling updates ated trying to fix mobile scrolling issue. getting there.	2014-09-12 13:40:00 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rob H	f5048ecf7c	Sends confirmation email when Enterprise is created	2014-09-12 13:24:17 +10:00
Rohan Mitchell	4fb30f2942	When removing outgoing exchanges, do not removing variants from other outgoing exchanges	2014-09-12 12:50:04 +10:00
Rob H	cc65faadd0	Specing out enterprise registration service properly	2014-09-12 11:48:17 +10:00
summerscope	a28eaba31a	Turn off price graph pop overs for small devices	2014-09-12 11:45:13 +10:00
summerscope	1c5a495d5c	Making icons smaller, adding a bit of background shadow to pop them out	2014-09-12 11:29:41 +10:00
summerscope	01397b2e49	Tweaks to filter box	2014-09-12 11:01:35 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
summerscope	ecacde41dd	Tweaks to big input for small screens	2014-09-12 11:00:10 +10:00