raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
summerscope
bf61d70e8f Adjust producer active table styles to accomodate new fat view markup 2014-06-20 09:59:32 +10:00
summerscope
9b25cfe67b Adjust active table styles to accommodate new fat view markup 2014-06-20 09:59:11 +10:00
summerscope
e4f4db82da Tweak markup for producer modal 2014-06-20 09:58:49 +10:00
summerscope
6d20b16c3c Tweak markup for map modal 2014-06-20 09:58:32 +10:00
summerscope
5b2e45b9ba More styling for modals for map view for hubs and producers 2014-06-20 09:58:06 +10:00
summerscope
0fa15750a1 Styling for modals - move the X to close icon inside canvas on small devices 2014-06-20 09:57:48 +10:00
summerscope
b1787ad65c Add in styling for product modal version of taxons 2014-06-20 09:57:18 +10:00
summerscope
b6ab46bcf8 Move style from modal css to typography for general use 2014-06-20 09:56:55 +10:00
Rob H
2861191ab7 Merge branch 'sm-desc' into working 2014-06-20 09:43:58 +10:00
Will Marshall
bffe036990 Merge branch 'laura_and_will' 2014-06-19 21:29:15 +10:00
Will Marshall
f8da754372 Patching Rabl helper 2014-06-19 21:26:51 +10:00
Rob H
0d7c682b85 Remove shipping category from admin edit shipping methods 2014-06-19 18:31:52 +10:00
Rob H
0527900453 Change text of OC collection details 2014-06-19 18:02:05 +10:00
Rob H
3c24be3c0b Change text of OC delivery instructions placeholder 2014-06-19 17:57:23 +10:00
Rob H
bd13b2b3fc Add shipping method description to confirmation email, cleanup 2014-06-19 17:52:25 +10:00
summerscope
c141707ef6 Adding some styles for fat view on active table - needs to be pulled out to hub_node.css.sass WIP commit 2014-06-19 17:09:02 +10:00
summerscope
5984a233ec Tweaking styles for producer node to allow for new CTA link row WIP commit 2014-06-19 17:08:24 +10:00
summerscope
cdbcf733e3 Tweaking styles for hub node to allow for new CTA link rwo 2014-06-19 17:07:58 +10:00
summerscope
bc7bf36c9d Tweaking styles for active table to allow for new CTA link rwo 2014-06-19 17:07:39 +10:00
summerscope
6a350e4867 Tweak order of classes 2014-06-19 17:07:16 +10:00
summerscope
d1b6a7b2a2 Adjusting markup for active table producer fat view WIP commit 2014-06-19 17:06:38 +10:00
summerscope
7c5dc397b9 Adjusting markup for active table hub fat view for new layout 2014-06-19 17:06:16 +10:00
Rob H
df660ff536 Adding shipping method description to checkout 2014-06-19 16:34:28 +10:00
summerscope
591441b968 Making a js change to remove hub name from shipping method label 2014-06-19 16:31:11 +10:00
summerscope
238c783e77 Style writing for enterprise modals 2014-06-19 16:30:50 +10:00
summerscope
3747306c31 Styling for producer modal on map 2014-06-19 16:30:36 +10:00
summerscope
c50426328e Styling for hub modal on map 2014-06-19 16:30:22 +10:00
summerscope
3fef2e8ada Changing name of classes to be less contextual and more reusable 2014-06-19 16:29:43 +10:00
summerscope
5319ad8846 Changing name of classes to be less contextual and more reusable 2014-06-19 16:29:28 +10:00
Rob H
9135a8f27b Change 'ready on' to 'ready for' 2014-06-19 16:28:16 +10:00
summerscope
e74ee3c6d5 Generic modal styling and options 2014-06-19 15:42:35 +10:00
summerscope
4c160ac83f Changing markup for CONTACT section of enterprise modal 2014-06-19 15:42:35 +10:00
summerscope
b68d038dd0 Markup adjustments for producer modal on map view - styling all the things! making things dynamic to show and hide 2014-06-19 15:42:35 +10:00
summerscope
ee38bc70b2 Renaming stylesheet for naming consistancy 2014-06-19 15:42:35 +10:00
summerscope
a1f1654e95 Renaming stylesheet for naming consistency 2014-06-19 15:42:34 +10:00
summerscope
a74766909a Adding a stylesheet specifically for enterprises e.g. hubs and producers 2014-06-19 15:42:34 +10:00
summerscope
ce28e286da Make the rabl capture phone number at enterprise level 2014-06-19 15:42:33 +10:00
Will Marshall
a4d12c4515 Patching up IE warning 2014-06-19 15:18:14 +10:00
Will Marshall
24f147d81d Adding pickup and delivery 2014-06-19 14:38:05 +10:00
Will Marshall
34e2170faf Patching some regressions 2014-06-19 14:36:47 +10:00
Will Marshall
6e5e202461 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/map_modal.js.coffee
	app/assets/javascripts/darkswarm/services/product.js.coffee
	app/assets/javascripts/templates/map_modal_hub.html.haml
	app/assets/javascripts/templates/map_modal_producer.html.haml
	app/assets/javascripts/templates/partials/contact.html.haml
	app/views/home/_fat.html.haml
	spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
 2014-06-19 14:22:23 +10:00
Will Marshall
a7f4256897 Fixing a minor regression 2014-06-19 14:19:15 +10:00
Will Marshall
4684c92c6e Minor refactoring from code review with Rohan 2014-06-19 14:19:14 +10:00
summerscope
5fc95462bf Tweak IE old warning css to remove css anims (not supported old browsers anyway) 2014-06-19 14:19:14 +10:00
summerscope
fbe56ce3d6 Tweak IE old warning message for stakeholder feedback 2014-06-19 14:19:14 +10:00
summerscope
aa88eeac72 Changing Producer modal markup to reflect new design. WIP commit, 2014-06-19 14:19:14 +10:00
summerscope
add89ffb47 Update images styling to make more generic / modular and remove styling specific to producers to make more scalable. 2014-06-19 14:19:14 +10:00
summerscope
50ac838e19 Update follow markup to reflect new design WIP commit 2014-06-19 14:19:13 +10:00
summerscope
a5e412fbe9 Update contact markup to reflect new design 2014-06-19 14:19:13 +10:00
summerscope
9b532205e5 Changing markup to Hub modal (map) to reflect new design 2014-06-19 14:19:13 +10:00