Commit Graph

15608 Commits

Author SHA1 Message Date
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
summerscope
abb64531a7 Adding stylesheet to manage modals for Hubs and Producers 2014-06-19 14:19:13 +10:00
Will Marshall
841621a56f Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-19 14:19:13 +10:00
summerscope
60bd89533e Turn off IE message ready for logic 2014-06-19 14:19:13 +10:00
summerscope
f463f71fb7 Add browser logos for IE message 2014-06-19 14:19:12 +10:00
summerscope
f601ad21a2 Update markup to include links to modern browsers for upgrade 2014-06-19 14:19:12 +10:00
summerscope
b1cf64d290 Styling for old IE upgrade / warning message 2014-06-19 14:19:12 +10:00
Will Marshall
e5c62e6c59 Refactoring JSON injection a bit further 2014-06-19 14:19:12 +10:00
Will Marshall
35d5dde5aa Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-19 14:19:11 +10:00
Will Marshall
a2965696da Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-19 14:19:11 +10:00
Will Marshall
c8384f1a71 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-19 14:19:11 +10:00
summerscope
b7e19ca290 Tweak styling and add animation-in function for Loading text message 2014-06-19 14:19:11 +10:00
Will Marshall
0909162424 Changing our composition of producers and hubs 2014-06-19 14:19:11 +10:00
Will Marshall
75366b96e1 Reworking the empties cart and active table link stuff 2014-06-19 14:19:10 +10:00
Will Marshall
b195ac3a84 Changing icon markup 2014-06-19 14:19:10 +10:00
Will Marshall
653da728c6 Starting a set of small functional changes 2014-06-19 14:19:10 +10:00
summerscope
f6c46d4707 Tweak label until shipping methods are available 2014-06-19 14:19:10 +10:00
summerscope
2cbcbed644 Site tagline constrain width on large screens to improve text flow 2014-06-19 14:19:10 +10:00