Commit Graph

  • d6341b65e5 Add edit button to Order cycles index Rob H 2014-06-20 16:22:55 +10:00
  • 1a0a8ec160 Merge branch 'master' into working Rob H 2014-06-20 13:54:52 +10:00
  • 8bb5f75ea0 Temporary fix to get staging working Will Marshall 2014-06-20 13:51:21 +10:00
  • 1f72bade65 Changing promo image explanation text Rob H 2014-06-20 13:47:33 +10:00
  • 3d1927d545 Merge branch 'master' into working Rob H 2014-06-20 12:29:47 +10:00
  • a668a4fd55 Further tidy-up for order confirmation email Rob H 2014-06-20 12:21:33 +10:00
  • c955bf61ac Reverting the main_app changes Will Marshall 2014-06-20 12:11:00 +10:00
  • ba842be5b8 Loading enterprises per-view again Will Marshall 2014-06-20 12:03:51 +10:00
  • 17521516b4 Patching up some regressions with the tabs Will Marshall 2014-06-20 11:33:30 +10:00
  • b0d88c071a Merge branch 'laura_and_will' Will Marshall 2014-06-20 10:49:31 +10:00
  • c97fa711b7 Adding config changes to app.rb, fixing mixing producers links Will Marshall 2014-06-20 10:47:46 +10:00
  • a362c2591f Remove parentheses from address on button summerscope 2014-06-20 10:42:52 +10:00
  • 9a59f6b520 Remove parentheses from address on button summerscope 2014-06-20 10:36:09 +10:00
  • 5a005d944b Remove parentheses from address on button summerscope 2014-06-20 10:35:58 +10:00
  • 521030a8a5 Tweak background color to taxons summerscope 2014-06-20 10:35:11 +10:00
  • f4fc0beb36 Styling about on hub shopfront page summerscope 2014-06-20 10:34:46 +10:00
  • 23542136ed Add a small hero image class summerscope 2014-06-20 10:34:04 +10:00
  • db158a16d4 Merge branch 'laura_and_will' Will Marshall 2014-06-20 10:33:44 +10:00
  • 93dbfdab3f Tweak menu styling to make logo sit in center of container summerscope 2014-06-20 10:22:54 +10:00
  • 620c7f1cf8 Tweak taxon background color so it shows up against white summerscope 2014-06-20 10:22:36 +10:00
  • 3a1bf24a86 Product modal adjust markup for SVG icon styling summerscope 2014-06-20 10:00:54 +10:00
  • f87b2ea1e3 Producer hubs view - fat node - adjust markup to make more dynamic, adjust for new designs summerscope 2014-06-20 10:00:36 +10:00
  • 48292be98b Home hubs view - fat node - adjust markup to make more dynamic, adjust for new designs summerscope 2014-06-20 10:00:16 +10:00
  • bf61d70e8f Adjust producer active table styles to accomodate new fat view markup summerscope 2014-06-20 09:59:32 +10:00
  • 9b25cfe67b Adjust active table styles to accommodate new fat view markup summerscope 2014-06-20 09:59:11 +10:00
  • e4f4db82da Tweak markup for producer modal summerscope 2014-06-20 09:58:49 +10:00
  • 6d20b16c3c Tweak markup for map modal summerscope 2014-06-20 09:58:32 +10:00
  • 5b2e45b9ba More styling for modals for map view for hubs and producers summerscope 2014-06-20 09:58:06 +10:00
  • 0fa15750a1 Styling for modals - move the X to close icon inside canvas on small devices summerscope 2014-06-20 09:57:48 +10:00
  • b1787ad65c Add in styling for product modal version of taxons summerscope 2014-06-20 09:57:18 +10:00
  • b6ab46bcf8 Move style from modal css to typography for general use summerscope 2014-06-20 09:56:55 +10:00
  • 2861191ab7 Merge branch 'sm-desc' into working Rob H 2014-06-20 09:43:58 +10:00
  • bffe036990 Merge branch 'laura_and_will' Will Marshall 2014-06-19 21:29:15 +10:00
  • f8da754372 Patching Rabl helper Will Marshall 2014-06-19 21:26:51 +10:00
  • 0d7c682b85 Remove shipping category from admin edit shipping methods Rob H 2014-06-19 18:31:52 +10:00
  • 0527900453 Change text of OC collection details Rob H 2014-06-19 18:02:05 +10:00
  • 3c24be3c0b Change text of OC delivery instructions placeholder Rob H 2014-06-19 17:57:23 +10:00
  • bd13b2b3fc Add shipping method description to confirmation email, cleanup Rob H 2014-06-19 17:52:25 +10:00
  • c141707ef6 Adding some styles for fat view on active table - needs to be pulled out to hub_node.css.sass WIP commit summerscope 2014-06-19 17:09:02 +10:00
  • 5984a233ec Tweaking styles for producer node to allow for new CTA link row WIP commit summerscope 2014-06-19 17:08:24 +10:00
  • cdbcf733e3 Tweaking styles for hub node to allow for new CTA link rwo summerscope 2014-06-19 17:07:58 +10:00
  • bc7bf36c9d Tweaking styles for active table to allow for new CTA link rwo summerscope 2014-06-19 17:07:39 +10:00
  • 6a350e4867 Tweak order of classes summerscope 2014-06-19 17:07:16 +10:00
  • d1b6a7b2a2 Adjusting markup for active table producer fat view WIP commit summerscope 2014-06-19 17:06:38 +10:00
  • 7c5dc397b9 Adjusting markup for active table hub fat view for new layout summerscope 2014-06-19 17:06:16 +10:00
  • df660ff536 Adding shipping method description to checkout Rob H 2014-06-19 16:34:28 +10:00
  • 591441b968 Making a js change to remove hub name from shipping method label summerscope 2014-06-19 16:31:11 +10:00
  • 238c783e77 Style writing for enterprise modals summerscope 2014-06-19 16:30:50 +10:00
  • 3747306c31 Styling for producer modal on map summerscope 2014-06-19 16:30:36 +10:00
  • c50426328e Styling for hub modal on map summerscope 2014-06-19 16:30:22 +10:00
  • 3fef2e8ada Changing name of classes to be less contextual and more reusable summerscope 2014-06-19 16:29:43 +10:00
  • 5319ad8846 Changing name of classes to be less contextual and more reusable summerscope 2014-06-19 16:29:28 +10:00
  • 9135a8f27b Change 'ready on' to 'ready for' Rob H 2014-06-19 16:28:16 +10:00
  • e74ee3c6d5 Generic modal styling and options summerscope 2014-06-19 15:39:53 +10:00
  • 4c160ac83f Changing markup for CONTACT section of enterprise modal summerscope 2014-06-19 15:39:22 +10:00
  • b68d038dd0 Markup adjustments for producer modal on map view - styling all the things! making things dynamic to show and hide summerscope 2014-06-19 15:38:34 +10:00
  • ee38bc70b2 Renaming stylesheet for naming consistancy summerscope 2014-06-19 15:37:56 +10:00
  • a1f1654e95 Renaming stylesheet for naming consistency summerscope 2014-06-19 15:37:29 +10:00
  • a74766909a Adding a stylesheet specifically for enterprises e.g. hubs and producers summerscope 2014-06-19 15:37:07 +10:00
  • ce28e286da Make the rabl capture phone number at enterprise level summerscope 2014-06-19 14:26:42 +10:00
  • a4d12c4515 Patching up IE warning Will Marshall 2014-06-19 15:18:14 +10:00
  • 24f147d81d Adding pickup and delivery Will Marshall 2014-06-19 14:38:05 +10:00
  • 34e2170faf Patching some regressions Will Marshall 2014-06-19 14:36:47 +10:00
  • 6e5e202461 Merge branch 'master' into laura_and_will Will Marshall 2014-06-19 14:22:23 +10:00
  • a7f4256897 Fixing a minor regression Will Marshall 2014-06-19 12:10:05 +10:00
  • 4684c92c6e Minor refactoring from code review with Rohan Will Marshall 2014-06-19 11:41:24 +10:00
  • 5fc95462bf Tweak IE old warning css to remove css anims (not supported old browsers anyway) summerscope 2014-06-19 11:32:30 +10:00
  • fbe56ce3d6 Tweak IE old warning message for stakeholder feedback summerscope 2014-06-19 11:30:41 +10:00
  • aa88eeac72 Changing Producer modal markup to reflect new design. WIP commit, summerscope 2014-06-18 18:53:31 +10:00
  • add89ffb47 Update images styling to make more generic / modular and remove styling specific to producers to make more scalable. summerscope 2014-06-18 18:53:02 +10:00
  • 50ac838e19 Update follow markup to reflect new design WIP commit summerscope 2014-06-18 18:52:29 +10:00
  • a5e412fbe9 Update contact markup to reflect new design summerscope 2014-06-18 18:52:07 +10:00
  • 9b532205e5 Changing markup to Hub modal (map) to reflect new design summerscope 2014-06-18 18:50:59 +10:00
  • abb64531a7 Adding stylesheet to manage modals for Hubs and Producers summerscope 2014-06-18 18:50:40 +10:00
  • 841621a56f Further patches to the damned RABL system, patching everything up to use our new Service structure Will Marshall 2014-06-18 17:54:13 +10:00
  • 60bd89533e Turn off IE message ready for logic summerscope 2014-06-18 17:14:20 +10:00
  • f463f71fb7 Add browser logos for IE message summerscope 2014-06-18 17:11:57 +10:00
  • f601ad21a2 Update markup to include links to modern browsers for upgrade summerscope 2014-06-18 17:11:08 +10:00
  • b1cf64d290 Styling for old IE upgrade / warning message summerscope 2014-06-18 17:10:47 +10:00
  • e5c62e6c59 Refactoring JSON injection a bit further Will Marshall 2014-06-18 16:43:57 +10:00
  • 35d5dde5aa Adding dereferencing on construct to Enterprises service - this is MAGIC Will Marshall 2014-06-18 15:48:24 +10:00
  • a2965696da Refactoring the RABL injection and the Hubs/Producers/Enterprises services Will Marshall 2014-06-18 15:40:02 +10:00
  • c8384f1a71 Reworking the RABL templates for simplicity AND fixing up all the tests Will Marshall 2014-06-18 13:05:44 +10:00
  • b7e19ca290 Tweak styling and add animation-in function for Loading text message summerscope 2014-06-18 12:37:11 +10:00
  • 0909162424 Changing our composition of producers and hubs Will Marshall 2014-06-17 16:33:43 +10:00
  • 75366b96e1 Reworking the empties cart and active table link stuff Will Marshall 2014-06-17 16:33:31 +10:00
  • b195ac3a84 Changing icon markup Will Marshall 2014-06-17 14:34:38 +10:00
  • 653da728c6 Starting a set of small functional changes Will Marshall 2014-06-17 12:35:03 +10:00
  • f6c46d4707 Tweak label until shipping methods are available summerscope 2014-06-17 10:50:47 +10:00
  • 2cbcbed644 Site tagline constrain width on large screens to improve text flow summerscope 2014-06-14 21:00:32 +10:00
  • 53aaf6bff3 Making input label in shopfront small to distinguish from variant name and price summerscope 2014-06-13 14:32:06 +10:00
  • d20c952595 fixing issue 750 Will Marshall 2014-06-13 14:31:55 +10:00
  • 4a053a50ea New animation mixin summerscope 2014-06-13 14:20:58 +10:00
  • 8c6e0c6b18 Remove SVG styling from this scss - now in taxons.css.sass summerscope 2014-06-13 14:20:47 +10:00
  • 397d15999f Remove SVG styling from this scss - now in taxons.css.sass summerscope 2014-06-13 14:20:31 +10:00
  • f3ca82ec8e New stylesheet to style taxon SVG icons summerscope 2014-06-13 14:20:10 +10:00
  • ce1732db27 Adding taxon preview (big) to the admin UI Will Marshall 2014-06-19 14:18:52 +10:00
  • 7f4816c9a5 Adding new producer modal and dereferencing shopfront Will Marshall 2014-06-19 14:00:37 +10:00
  • 9951f668e8 Adding 180x180 size to logo Will Marshall 2014-06-19 13:00:28 +10:00
  • 36451423ba Producer fat view Will Marshall 2014-06-19 12:56:55 +10:00