34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	fc95e088df	Show collapsed price breakdown	2014-07-30 14:59:16 +10:00
Rohan Mitchell	77b279ca97	Stub base_price and fees on variant serializer. Calculate basePricePercentage on variant.	2014-07-30 14:34:05 +10:00
Rohan Mitchell	1ac5b79aeb	Fix failing JS specs	2014-07-30 14:33:36 +10:00
Will Marshall	339e5975fa	Merge branch 'master' into breakdowns	2014-07-30 13:45:46 +10:00
Will Marshall	88c3f7f9b3	Removing a couple of pointless files	2014-07-30 13:45:37 +10:00
summerscope	cf1cf085d9	Popover for shopping cart styling required for medium and small views	2014-07-29 17:08:31 +10:00
summerscope	47a38d1815	Tweak the styling on producer modals so no grey background	2014-07-29 16:50:48 +10:00
summerscope	8ed79c6e55	Make scrolling on outer container only	2014-07-29 16:50:26 +10:00
summerscope	62d5149e7a	Add back styling which sort of works for modals until i can pair with will to fix it	2014-07-29 16:15:35 +10:00
summerscope	682b04287e	Make product thumbnail background white by default	2014-07-29 16:03:13 +10:00
Will Marshall	10fcf80be1	Switching back to proper bounds fitting	2014-07-29 15:34:14 +10:00
Will Marshall	606981dee9	Merge branch 'maps'	2014-07-29 15:32:23 +10:00
Will Marshall	6873b33e1f	Directive restored	2014-07-29 15:32:19 +10:00
Will Marshall	90eea5cb16	Switching to a single directive to render variants on /shop	2014-07-29 15:23:10 +10:00
Will Marshall	4264e3b7b7	Fixing a time issue	2014-07-29 14:11:51 +10:00
Will Marshall	2ef0545561	Merge branch 'laura_and_will'	2014-07-29 14:09:29 +10:00
Will Marshall	71b898cdec	Tweaking product image logic	2014-07-29 14:09:28 +10:00
Will Marshall	1e207fefd1	Fixing the product modal so it renders either an actual image or nothing	2014-07-29 14:09:28 +10:00
Will Marshall	8496609cc2	Fixing up a couple of regressions	2014-07-29 13:46:38 +10:00
summerscope	e5b675dcaf	Change thumbnail outline color	2014-07-29 13:35:59 +10:00
summerscope	d8fa5a1af9	Make product thumb resized and recoloured	2014-07-29 13:34:19 +10:00
Will Marshall	21cc5bc05a	Tweaking product image logic	2014-07-29 13:05:45 +10:00
Will Marshall	8e5951f80c	Fixing the product modal so it renders either an actual image or nothing	2014-07-29 13:05:44 +10:00
summerscope	b60c9daf21	Modal tweaks to make interior container scroll when too high	2014-07-29 12:57:22 +10:00
Will Marshall	f1c4ca98a1	Defaulting to OFN logo	2014-07-29 12:55:58 +10:00
Will Marshall	118e0f9fd8	Rescoping a couple of partials	2014-07-29 12:51:51 +10:00
Will Marshall	48b8c7e6c1	reverting our change back to position fixed	2014-07-29 12:51:51 +10:00
summerscope	e308b7a3a8	Comment out Price breakdown graph and popover until we can make this work	2014-07-29 12:26:36 +10:00
Will Marshall	2d40a8f023	Fixing links on modals	2014-07-29 12:20:06 +10:00
Will Marshall	c4f7c1af60	Lots of small bug fixes, changing image sizes	2014-07-29 11:33:25 +10:00
Will Marshall	39a79869c0	Disabling buttons and some work on the price breakdowns, including commenting them out for now	2014-07-29 11:33:25 +10:00
summerscope	4ab781d74a	Update and tweak producers page background image	2014-07-29 10:53:34 +10:00
summerscope	004de7919a	Add sexy search into groups page	2014-07-29 10:42:30 +10:00
summerscope	3ebc2ba145	Fix checkout button layout in menu for firefox etc	2014-07-28 16:41:26 +10:00
summerscope	d6c9f41a00	Making the styling for headings on modals better	2014-07-28 16:14:44 +10:00
summerscope	6dc15ff075	Make the modal headers consistent	2014-07-28 16:14:20 +10:00
summerscope	3d472bc57e	Make the header styles consistent for the modals	2014-07-28 16:14:01 +10:00
summerscope	cd27a2f3cb	Update map icons to make them match new colors	2014-07-28 16:10:17 +10:00
summerscope	8f83853a5c	Hub remove unnecessary style	2014-07-28 15:23:55 +10:00
summerscope	06cf8c1f0f	A little bit more refactoring to make things scalable and cleaner	2014-07-28 15:04:07 +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	9e4615f141	Refactoring css for active_table and hub producer children. Tighten and tidy css, make consistent for hubs and producers nodes across all responsive sizes.	2014-07-28 13:51:44 +10:00
summerscope	68aaf24f5c	Remove active_table specific styles from this stuff	2014-07-28 13:51:44 +10:00
summerscope	7a62ae6637	Add style for turquoise text	2014-07-28 13:51:44 +10:00
summerscope	f53902da0f	Tweak hubs for responsive views	2014-07-28 13:51:44 +10:00
summerscope	78ac55418c	Tweak producers for responsive views,	2014-07-28 13:51:43 +10:00
Will Marshall	20d7484134	Merge branch 'master' into laura_and_will ... Conflicts: app/assets/javascripts/darkswarm/services/order.js.coffee	2014-07-28 13:43:31 +10:00
Will Marshall	9d0919d201	Further minor regressions	2014-07-28 13:41:38 +10:00
Will Marshall	a5f478bde7	Ajax submission of max quantity	2014-07-28 13:33:13 +10:00
Will Marshall	39f9e991ad	Minor regressions and bug fixes	2014-07-28 11:30:35 +10:00