3053 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob H	0785509bc4	Add plus icon to new order cycles button	2014-06-20 17:00:36 +10:00
Rob H	9f285b1d8c	Add plus icon to new enterprises button	2014-06-20 17:00:07 +10:00
Rob H	a448ccdad4	Remove unused enterprise show page	2014-06-20 16:53:04 +10:00
Rob H	d71966b5c0	Change show link to edit link on admin enterprises index	2014-06-20 16:39:09 +10:00
Rob H	4b437e2ab5	Realign enterprises social media form components	2014-06-20 16:38:10 +10:00
Rob H	d6341b65e5	Add edit button to Order cycles index	2014-06-20 16:22:55 +10:00
Rob H	1a0a8ec160	Merge branch 'master' into working	2014-06-20 13:54:52 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Rob H	1f72bade65	Changing promo image explanation text	2014-06-20 13:47:33 +10:00
Rob H	3d1927d545	Merge branch 'master' into working	2014-06-20 12:29:47 +10:00
Rob H	a668a4fd55	Further tidy-up for order confirmation email	2014-06-20 12:21:33 +10:00
Will Marshall	c955bf61ac	Reverting the main_app changes	2014-06-20 12:11:00 +10:00
Will Marshall	ba842be5b8	Loading enterprises per-view again	2014-06-20 12:03:51 +10:00
Will Marshall	17521516b4	Patching up some regressions with the tabs	2014-06-20 11:33:30 +10:00
Will Marshall	b0d88c071a	Merge branch 'laura_and_will'	2014-06-20 10:49:31 +10:00
Will Marshall	c97fa711b7	Adding config changes to app.rb, fixing mixing producers links	2014-06-20 10:47:46 +10:00
summerscope	a362c2591f	Remove parentheses from address on button	2014-06-20 10:42:52 +10:00
summerscope	9a59f6b520	Remove parentheses from address on button	2014-06-20 10:36:09 +10:00
summerscope	5a005d944b	Remove parentheses from address on button	2014-06-20 10:35:58 +10:00
summerscope	521030a8a5	Tweak background color to taxons	2014-06-20 10:35:11 +10:00
summerscope	f4fc0beb36	Styling about on hub shopfront page	2014-06-20 10:34:46 +10:00
summerscope	23542136ed	Add a small hero image class	2014-06-20 10:34:04 +10:00
Will Marshall	db158a16d4	Merge branch 'laura_and_will'	2014-06-20 10:33:44 +10:00
summerscope	93dbfdab3f	Tweak menu styling to make logo sit in center of container	2014-06-20 10:22:54 +10:00
summerscope	620c7f1cf8	Tweak taxon background color so it shows up against white	2014-06-20 10:22:36 +10:00
summerscope	3a1bf24a86	Product modal adjust markup for SVG icon styling	2014-06-20 10:00:54 +10:00
summerscope	f87b2ea1e3	Producer hubs view - fat node - adjust markup to make more dynamic, adjust for new designs	2014-06-20 10:00:36 +10:00
summerscope	48292be98b	Home hubs view - fat node - adjust markup to make more dynamic, adjust for new designs	2014-06-20 10:00:16 +10:00
summerscope	bf61d70e8f	Adjust producer active table styles to accomodate new fat view markup	2014-06-20 09:59:32 +10:00
summerscope	9b25cfe67b	Adjust active table styles to accommodate new fat view markup	2014-06-20 09:59:11 +10:00
summerscope	e4f4db82da	Tweak markup for producer modal	2014-06-20 09:58:49 +10:00
summerscope	6d20b16c3c	Tweak markup for map modal	2014-06-20 09:58:32 +10:00
summerscope	5b2e45b9ba	More styling for modals for map view for hubs and producers	2014-06-20 09:58:06 +10:00
summerscope	0fa15750a1	Styling for modals - move the X to close icon inside canvas on small devices	2014-06-20 09:57:48 +10:00
summerscope	b1787ad65c	Add in styling for product modal version of taxons	2014-06-20 09:57:18 +10:00
summerscope	b6ab46bcf8	Move style from modal css to typography for general use	2014-06-20 09:56:55 +10:00
Rob H	2861191ab7	Merge branch 'sm-desc' into working	2014-06-20 09:43:58 +10:00
Will Marshall	bffe036990	Merge branch 'laura_and_will'	2014-06-19 21:29:15 +10:00
Will Marshall	f8da754372	Patching Rabl helper	2014-06-19 21:26:51 +10:00
Rob H	0d7c682b85	Remove shipping category from admin edit shipping methods	2014-06-19 18:31:52 +10:00
Rob H	0527900453	Change text of OC collection details	2014-06-19 18:02:05 +10:00
Rob H	3c24be3c0b	Change text of OC delivery instructions placeholder	2014-06-19 17:57:23 +10:00
Rob H	bd13b2b3fc	Add shipping method description to confirmation email, cleanup	2014-06-19 17:52:25 +10:00
summerscope	c141707ef6	Adding some styles for fat view on active table - needs to be pulled out to hub_node.css.sass WIP commit	2014-06-19 17:09:02 +10:00
summerscope	5984a233ec	Tweaking styles for producer node to allow for new CTA link row WIP commit	2014-06-19 17:08:24 +10:00
summerscope	cdbcf733e3	Tweaking styles for hub node to allow for new CTA link rwo	2014-06-19 17:07:58 +10:00
summerscope	bc7bf36c9d	Tweaking styles for active table to allow for new CTA link rwo	2014-06-19 17:07:39 +10:00
summerscope	6a350e4867	Tweak order of classes	2014-06-19 17:07:16 +10:00
summerscope	d1b6a7b2a2	Adjusting markup for active table producer fat view WIP commit	2014-06-19 17:06:38 +10:00
summerscope	7c5dc397b9	Adjusting markup for active table hub fat view for new layout	2014-06-19 17:06:16 +10:00