569 Commits

Author	SHA1	Message	Date
summerscope	2c5208ce6b	Change ent type page, simplify!	2014-10-17 11:17:53 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rob Harrington	a6480e6831	Merge in enterprise confirmation	2014-10-16 11:52:10 +11:00
Rob Harrington	63e50dc88c	Fiddle with alert styling	2014-10-16 11:34:06 +11:00
Rob Harrington	c59662758c	Add alerts for unconfirmed enterprises to overview page	2014-10-15 15:46:21 +11:00
summerscope	d4318263f6	Registration modals styling WIP	2014-10-10 18:18:33 +11:00
Rob Harrington	9b275cc5f0	WIP: Shuffling around order of cards in registration	2014-10-09 17:26:31 +11:00
Rob Harrington	d1e3f74c03	Add loading gif to image uploaders	2014-10-09 15:56:54 +11:00
Rob Harrington	49c8e2f8cb	Remove used styling for inline flash	2014-10-09 13:16:09 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	f3fc70ebf0	Merge branch 'master' into raf_bugfix ... Conflicts: app/assets/stylesheets/admin/openfoodnetwork.css.scss	2014-10-04 12:51:55 +10:00
Rafael Schouten	a552fb18da	style profile check	2014-10-04 01:00:02 +10:00
Rafael Schouten	34ceb9c226	style text box	2014-10-03 16:06:15 +10:00
Rafael Schouten	ff4f8f63af	Merge branch 'master' into raf_bugfix ... Conflicts: app/views/spree/order_mailer/confirm_email.text.haml	2014-10-02 19:06:30 +10:00
Rafael Schouten	f29898886d	return basic css and js for oldskool login that somehow still exists	2014-10-02 13:24:59 +10: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	3a14a26bc6	refactor wysiwyg	2014-10-01 16:07:10 +10:00
Rafael Schouten	206c8da0ba	remove unused css*	2014-09-30 23:53:45 +10:00
Rafael Schouten	726340fc86	configure textAngular on enterprise edit page	2014-09-30 18:20:45 +10:00
Rafael Schouten	dee869a273	move checks and links in sidebars	2014-09-26 17:58:00 +10:00
summerscope	2ea0c89899	Style the modal headers	2014-09-26 15:01:23 +10:00
summerscope	781fcae946	Change styling for register modals	2014-09-26 15:01:22 +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
Rafael Schouten	da620f3723	Merge branch 'master' into ent_types_frontend	2014-09-25 10:09:42 +10:00
Rafael Schouten	139da3ac7a	outline inputs with errors	2014-09-24 16:59:57 +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	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	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
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
summerscope	cc9d2ebbac	Modal styling fixes for scrolling on mobile view	2014-09-12 16:01:25 +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
summerscope	a28eaba31a	Turn off price graph pop overs for small devices	2014-09-12 11:45:13 +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
summerscope	126e9e82a6	Add in blues for use	2014-09-12 10:58:51 +10:00
summerscope	de64a5154b	Fixing markup icon class name was incorrect	2014-09-11 17:13:07 +10:00
Rob H	454e4c971a	Adding validation to address page	2014-09-11 17:10:59 +10:00
Rob H	34841f8543	Refactoring registration form controller	2014-09-11 17:10:59 +10:00
summerscope	6486e41576	More styling for registration	2014-09-11 17:10:08 +10:00