Commit Graph

17 Commits

Author SHA1 Message Date
Rohan Mitchell
faee88c404 Merge branch 'master' into redesign 2015-06-16 16:57:09 +10:00
Rob Harrington
fb11c93943 Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive 2015-06-15 15:43:01 +08:00
Rohan Mitchell
eac22df200 Merge branch 'master' into redesign
Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
Rick Giner
9e70c80d1d bind-once in product modal 2015-05-03 14:48:27 +10:00
summerscope
427f535026 Redesign big chunk of work:
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rob Harrington
7b83438b5e Pulling property values into the shopfront 2015-04-23 13:51:49 +10:00
Rob Harrington
ed15b95de0 Adding properties and taxons to producer modal 2015-04-23 12:31:20 +10:00
Rob Harrington
0cf8b017b9 Pulling out taxons and properties placeholders from producer and product modals 2015-04-17 13:20:01 +10:00
summerscope
b99e94cecf WIP on producer and product modals 2015-03-19 16:02:52 +11:00
summerscope
c76aa1d1c2 WIP on product modal 2015-03-19 14:52:09 +11:00
summerscope
dc1dd2e243 Changing the class .filter-box for shopfront to .filter-shopfront
This prevents the issue with inheritance / styling crossover
2015-03-13 16:06:46 +11:00
summerscope
bce64a1ead WIP product modals for shopfront 2015-03-13 15:34:11 +11:00
Rohan Mitchell
c43c35601b Set product.largeImage in JS, use for product modal 2014-09-05 15:10:16 +10:00
summerscope
659462327c Commenting out taxon icon for now 2014-07-31 11:29:14 +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
Will Marshall
f316b8dec5 Adding product modals in new format 2014-06-27 15:15:41 +10:00