Commit Graph

993 Commits

Author SHA1 Message Date
Rohan Mitchell
75a59eb5cc Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order. 2014-07-16 11:26:22 +10:00
Rohan Mitchell
edeb820c64 Send distributor and order cycle id to order add variant autocomplete search 2014-07-16 09:33:59 +10:00
Will Marshall
353ee20feb Animations fix 2014-07-11 17:07:54 +10:00
Will Marshall
744f254353 Patching a minor bug 2014-07-11 17:02:43 +10:00
Will Marshall
5e68d0bab7 Basic final version 2014-07-11 16:51:46 +10:00
Will Marshall
06047a380e Provisional animations 2014-07-11 16:40:44 +10:00
Will Marshall
e940777ede Few more animation fixes 2014-07-11 16:33:23 +10:00
summerscope
d43fa7eed5 Fixing animations for shopfront 2014-07-11 16:16:56 +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
summerscope
d67992eb7b Tweak animation stylings 2014-07-11 15:07:29 +10:00
summerscope
26d6ac5a8d Styling no results message for shopfront 2014-07-11 14:50:40 +10:00
summerscope
1eb18e8478 Add some padding to first child in active table - should not be styled from animation classes 2014-07-11 14:42:44 +10:00
summerscope
16d39aeacc Tweak line-height on product row in shopfront 2014-07-11 14:41:46 +10:00
summerscope
13cc9ba44d Remove line-height stuff which was making the animation in juddery 2014-07-11 14:41:18 +10:00
summerscope
068e3cce1c More tweaks to filters styling 2014-07-11 13:09:42 +10:00
summerscope
c907e35834 More styling on search and filters 2014-07-11 12:56:14 +10:00
Will Marshall
61dbc2cd63 Replace for shipping selector 2014-07-11 12:54:40 +10:00
Will Marshall
21d1d2d1c1 Replacing taxon directive 2014-07-11 12:53:32 +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
40b858306b Make all taxons sentence case. ALl of them! for reals yo. 2014-07-11 12:36:27 +10:00
summerscope
88b1b8b104 Styling search for shopfront page 2014-07-11 12:27:51 +10:00
summerscope
6adc056ce0 Styling filters and search on shopfront 2014-07-11 12:27:35 +10:00
summerscope
46017be45c Make big input fill out all width available 2014-07-11 12:27:17 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
summerscope
6681beae4d Fix spacing for shopfront page search box 2014-07-10 13:04:20 +10:00
summerscope
0e0cf5576d Restyle big search to make it MORE OBVIOUS. 2014-07-10 12:58:38 +10:00
summerscope
9fa62b39af More styling for filters and search 2014-07-10 12:22:08 +10:00
summerscope
34cb672a8d Adjust column layouts / responsive breakpoints for filter systems 2014-07-10 12:21:54 +10:00
summerscope
cf4c51e0d9 STyling taxon filters 2014-07-10 12:05:50 +10:00
Will Marshall
da02f9c0b0 Adding icons to shipping selectors 2014-07-10 12:02:34 +10:00
Will Marshall
409d647f62 Fixing up hubs page 2014-07-10 11:38:17 +10:00
summerscope
7c1dfa7b23 Add min width to filter button 2014-07-10 10:36:56 +10:00
summerscope
c744c61f25 Styling for shopfront page with search input 2014-07-09 17:35:21 +10:00
summerscope
ac8d3f8c96 Make a static (non animated) version of big input 2014-07-09 17:35:04 +10:00
summerscope
11ec596133 Layout adjust for taxon filters 2014-07-09 17:23:58 +10:00
summerscope
eda5119bfc Remove unused styling and unneeded comments 2014-07-09 16:57:33 +10:00
summerscope
0451dbe6b0 More styling to filters and search 2014-07-09 16:55:05 +10:00
summerscope
b43f687cf4 Tweak to producers - turn filters off by default 2014-07-09 16:54:35 +10:00
summerscope
d9a3d22330 Tweak labels for filter button 2014-07-09 16:53:26 +10:00
summerscope
9587b2a2ed Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will
Conflicts:
	app/views/producers/_filters.html.haml
2014-07-09 16:18:41 +10:00
summerscope
a4729a8d12 Tweak layout on taxon filters 2014-07-09 16:15:27 +10:00
summerscope
263060611d Search and filter styling and markup tweaks 2014-07-09 16:13:43 +10:00
Will Marshall
c8ee4a594c Some text changes and similar magic 2014-07-09 16:10:08 +10:00
Will Marshall
6f3f40e2e6 Adding query string to search params 2014-07-09 15:45:05 +10:00
Will Marshall
eb9ec1497c Backwards 2014-07-09 14:26:42 +10:00
Will Marshall
fb8d7907f9 Rearchitecting the thing 2014-07-09 14:07:38 +10:00
Will Marshall
c640233ee5 Merge branch 'master' into laura_and_will
Conflicts:
	app/assets/javascripts/darkswarm/filters/taxons.js.coffee
	app/models/enterprise.rb
	app/serializers/api/enterprise_serializer.rb
	db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
	db/schema.rb
	spec/helpers/shared_helper_spec.rb
	spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
	spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
	spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
	spec/models/enterprise_spec.rb
2014-07-09 11:40:54 +10:00