Commit Graph

1408 Commits

Author SHA1 Message Date
summerscope
d2850ae794 Tweak the layout of hubs for responsive 2014-07-25 13:16:21 +10:00
summerscope
995451351a Tweak layout of columns for Hubs listing on medium and small views 2014-07-24 17:43:07 +10:00
summerscope
c799d8b387 Make filter button turquoise 2014-07-24 17:41:48 +10:00
summerscope
a3278209ac Tweak markup for active table Hubs 2014-07-24 16:33:03 +10:00
Will Marshall
bd662d4ec8 Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will
Conflicts:
	app/views/shop/products/_master.html.haml
2014-07-24 16:07:56 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
summerscope
6961a2ad00 Take the pop overs out of the tabindex 2014-07-24 10:58:08 +10:00
summerscope
2d25bd8a45 Adding checkout button back to the top as a stop gap measure 2014-07-24 10:57:37 +10:00
Will Marshall
d7ff1cd4af Merge branch 'laura_and_will' into new_cart
Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
2014-07-24 10:39:36 +10:00
summerscope
a40b5689a9 Checkout page design tweaks and improvements to make accordion more usable 2014-07-23 16:57:38 +10:00
summerscope
fac7f9f818 Shopfront more styling and improvements for responsive. 2014-07-23 16:36:52 +10:00
summerscope
d6a4ae3cbf Will Marshall will you please read the comment here and help me with all the logix 2014-07-23 16:36:34 +10:00
summerscope
7718cf0c48 Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things 2014-07-23 15:35:44 +10:00
summerscope
98e6c5e412 Markup tweaks to tweak inclusion of graph popover button 2014-07-23 15:15:03 +10:00
summerscope
f6c1ddc08a No change 2014-07-23 15:14:33 +10:00
summerscope
93f576e616 Turning of Maps, Groups, and Producers panes 2014-07-18 17:17:42 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
2014-07-18 17:02:19 +10:00
summerscope
fe0956d3bb Update markup to make total price its own row on small devices 2014-07-18 16:36:14 +10:00
Will Marshall
a480353158 Working bindings 2014-07-18 16:05:58 +10:00
summerscope
751865a540 More markup tweaks for responsive 2014-07-18 16:05:30 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
summerscope
fca552b254 Adjusting markup and adding classes to target elements as needed for responsive styling 2014-07-18 12:52:59 +10:00
summerscope
957c8cf89b Markup changes to all the partials for new shopfront page design 2014-07-17 17:24:54 +10:00
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
Will Marshall
67922f38df Fixing some regressions to data submission 2014-07-17 14:46:46 +10:00
Will Marshall
541fe9ec37 Switching Checkout service to use CurrentOrder 2014-07-17 14:26:54 +10:00
Rohan Mitchell
19118da82e Remove old landing page cruft 2014-07-17 14:26:07 +10:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Will Marshall
500e067cfb Performance enhancements 2014-07-11 16:14:44 +10:00
Will Marshall
7bd65d7854 Performance improvements 2014-07-11 15:09:44 +10:00
Will Marshall
c852eefdbc Re-enabling infinite scroll 2014-07-11 15:09:44 +10:00
summerscope
26d6ac5a8d Styling no results message for shopfront 2014-07-11 14:50:40 +10:00
summerscope
23182a9026 Grid system layout for filter buttons for all sizes and breakpoints 2014-07-11 13:10:22 +10:00
Will Marshall
190e320bad Pulling some structure out of directives 2014-07-11 12:45:08 +10:00
Will Marshall
fecc68cff8 Dereferencing product Taxons 2014-07-11 12:40:49 +10:00
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
summerscope
88b1b8b104 Styling search for shopfront page 2014-07-11 12:27:51 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
Will Marshall
932ca95ec5 Sorting hubs by active 2014-07-10 13:04:45 +10:00
summerscope
c8f51ec917 Adjust layout for small views 2014-07-10 12:21:32 +10:00
summerscope
76b25945e9 Adjust layout for small views 2014-07-10 12:21:18 +10:00
Will Marshall
8296a4131e Partializing filter controls 2014-07-10 12:07:21 +10:00
summerscope
3e24e43100 Tweak icons for up / down 2014-07-10 12:05:49 +10:00
Will Marshall
409d647f62 Fixing up hubs page 2014-07-10 11:38:17 +10:00
Will Marshall
0b3b8883cd Disabling infinite scrolling due to bugs on iPad 2014-07-10 11:38:16 +10:00
summerscope
c744c61f25 Styling for shopfront page with search input 2014-07-09 17:35:21 +10:00
summerscope
2c157a939d Tweak markup / filters available for Producers page 2014-07-09 17:24:24 +10:00