Commit Graph

966 Commits

Author SHA1 Message Date
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
Will Marshall
7d39c30dbd Fixing a taxon bug 2014-07-09 10:54:40 +10:00
Will Marshall
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
summerscope
730fbc5e94 New texture for hubs background 2014-07-04 17:41:42 +10:00
summerscope
ac5c8ccfd4 Modal styling for active table removing background 2014-07-04 17:34:26 +10:00
summerscope
9ed0ebaa43 Hubs styling for bit sexy search 2014-07-04 17:33:02 +10:00
summerscope
5d2d4fd007 More styling adjustments for big sexy search 2014-07-04 17:32:43 +10:00
summerscope
56a1a66d3f Styling for big sexy search bar 2014-07-04 17:00:03 +10:00
summerscope
b50541fd15 Less padding below search bar 2014-07-04 15:50:00 +10:00
summerscope
7f00f66e82 Styling for filter systems against search 2014-07-04 15:47:51 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +10:00
Rohan Mitchell
30262e1969 Clean up specs, fix broken spec, remove JS log 2014-07-04 14:39:27 +10:00
Will Marshall
6d4dfad336 OK address no longer being lazy-loaded 2014-07-04 14:39:26 +10:00
Will Marshall
61d8be3ddc Removing old file, renaming one to match naming conventions 2014-07-04 14:39:26 +10:00
Will Marshall
24d3abf6d5 Adding dereferencing to taxons and reducing our data-set 2014-07-04 14:38:27 +10:00
Will Marshall
4a116570d1 adding by producer id filtering 2014-07-04 14:38:27 +10:00
Will Marshall
e858c0d434 Moving taxon filter to ID instead of name 2014-07-04 14:38:27 +10:00
Will Marshall
8b98c72336 Adding all the Angular filters required to make this work 2014-07-04 14:38:27 +10:00
Will Marshall
f335b6a576 Taxon selectors and show/hide behaviour 2014-07-04 14:09:53 +10:00
Will Marshall
a8fde53715 Removing old file, renaming one to match naming conventions 2014-07-04 13:51:23 +10:00
Will Marshall
487b8616c0 Adding dereferencing to taxons and reducing our data-set 2014-07-04 13:51:22 +10:00
Will Marshall
55bf59ba96 adding by producer id filtering 2014-07-04 13:51:22 +10:00
Will Marshall
1955048502 Moving taxon filter to ID instead of name 2014-07-04 13:51:22 +10:00
Will Marshall
f19a02264e Adding all the Angular filters required to make this work 2014-07-04 13:51:22 +10:00
summerscope
9d9dd777c1 Add in simple text style for global use 2014-07-04 13:39:55 +10:00
summerscope
ab4b72b9c7 Styling to make the taxons sit right for 1 and 2 lines 2014-07-04 13:39:19 +10:00
summerscope
87c6feec97 Remove padding - tighten up fat view 2014-07-04 11:32:32 +10:00
summerscope
9060e18a81 Tweak timings on the modal animations 2014-07-04 11:32:09 +10:00