Will Marshall
|
63807fd2cd
|
Fixing case when order doesn't axshully exist
|
2014-07-24 11:24:09 +10:00 |
|
Will Marshall
|
8ac0ee8f0e
|
Fixing a missing scope on product.variants
|
2014-07-24 11:23:56 +10:00 |
|
Will Marshall
|
d7ff1cd4af
|
Merge branch 'laura_and_will' into new_cart
Conflicts:
app/views/checkout/_payment.html.haml
app/views/checkout/_shipping.html.haml
app/views/shop/products/_master.html.haml
app/views/shop/products/_variants.html.haml
|
2014-07-24 10:39:36 +10:00 |
|
summerscope
|
a40b5689a9
|
Checkout page design tweaks and improvements to make accordion more usable
|
2014-07-23 16:57:38 +10:00 |
|
summerscope
|
fac7f9f818
|
Shopfront more styling and improvements for responsive.
|
2014-07-23 16:36:52 +10:00 |
|
summerscope
|
d6a4ae3cbf
|
Will Marshall will you please read the comment here and help me with all the logix
|
2014-07-23 16:36:34 +10:00 |
|
summerscope
|
609326793a
|
Styling for mobile menu line items
|
2014-07-23 15:36:15 +10:00 |
|
summerscope
|
7718cf0c48
|
Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things
|
2014-07-23 15:35:44 +10:00 |
|
summerscope
|
875f0f6780
|
Apply border radius against alllll the buttons
|
2014-07-23 15:15:48 +10:00 |
|
summerscope
|
47d84c25f6
|
Shopfront styling
|
2014-07-23 15:15:16 +10:00 |
|
summerscope
|
98e6c5e412
|
Markup tweaks to tweak inclusion of graph popover button
|
2014-07-23 15:15:03 +10:00 |
|
summerscope
|
f6c1ddc08a
|
No change
|
2014-07-23 15:14:33 +10:00 |
|
summerscope
|
5b87a81460
|
Tweak bullet point list style content: to include right icon
|
2014-07-23 15:14:14 +10:00 |
|
summerscope
|
9f0457f355
|
Tweaking reds to make them a touch less berry
|
2014-07-23 15:13:47 +10:00 |
|
summerscope
|
9782d76f61
|
Tweak avenir in big input to avoid padding conflict
|
2014-07-23 15:13:29 +10:00 |
|
summerscope
|
7d5e7a9123
|
New popovers sass partial
|
2014-07-23 15:13:12 +10:00 |
|
summerscope
|
6dd5588ed5
|
Updating icon font to included some new required icons
|
2014-07-23 15:12:55 +10:00 |
|
summerscope
|
93f576e616
|
Turning of Maps, Groups, and Producers panes
|
2014-07-18 17:17:42 +10:00 |
|
summerscope
|
d86172d504
|
Adding rounded corners to alllllll the buttons
|
2014-07-18 17:17:18 +10:00 |
|
summerscope
|
56850d6d7d
|
Design tweaks
|
2014-07-18 17:16:49 +10:00 |
|
summerscope
|
60a860b2ae
|
New background image for entry point
|
2014-07-18 17:16:24 +10:00 |
|
summerscope
|
3cb3dcccd9
|
Tweak background style for entry point to site
|
2014-07-18 17:16:14 +10:00 |
|
summerscope
|
8653d356ff
|
Tweaking primary red - more berry, less brick
|
2014-07-18 17:15:51 +10:00 |
|
summerscope
|
a711387794
|
Changing colors on SVGs to tweak for new primary red color
|
2014-07-18 17:15:35 +10:00 |
|
Will Marshall
|
92b7966941
|
Triggering dialog if page unsaved
|
2014-07-18 17:07:40 +10:00 |
|
Will Marshall
|
edaba844d9
|
Merge branch 'laura_and_will' into new_cart
Conflicts:
app/views/shop/products/_form.html.haml
app/views/shop/products/_master.html.haml
app/views/shop/products/_variants.html.haml
|
2014-07-18 17:02:19 +10:00 |
|
summerscope
|
fe0956d3bb
|
Update markup to make total price its own row on small devices
|
2014-07-18 16:36:14 +10:00 |
|
summerscope
|
63b0bb8122
|
Updating styling for product rows for small devices - total price gets its own row
|
2014-07-18 16:34:48 +10:00 |
|
summerscope
|
8d1175c495
|
Tweaks to input layout for responsive
|
2014-07-18 16:34:25 +10:00 |
|
Will Marshall
|
a480353158
|
Working bindings
|
2014-07-18 16:05:58 +10:00 |
|
summerscope
|
751865a540
|
More markup tweaks for responsive
|
2014-07-18 16:05:30 +10:00 |
|
summerscope
|
9e74bb8bf0
|
Pulling out css for refactoring, partials and further tweaks for responsive
|
2014-07-18 16:05:19 +10:00 |
|
summerscope
|
978b64547e
|
Refactoring SASS for shopfront to add partials, break it out into logical clusters
|
2014-07-18 16:04:53 +10:00 |
|
Will Marshall
|
b25def810c
|
Working version of the cart integration
|
2014-07-18 14:56:15 +10:00 |
|
Will Marshall
|
a3d402ad53
|
Moving variants to a service, backreferencing and linking
|
2014-07-18 13:59:34 +10:00 |
|
summerscope
|
93aa3b5364
|
Tweak responsive on taxon icons
|
2014-07-18 12:54:28 +10:00 |
|
summerscope
|
fca552b254
|
Adjusting markup and adding classes to target elements as needed for responsive styling
|
2014-07-18 12:52:59 +10:00 |
|
summerscope
|
29058fa7cc
|
Responsive styling and adjustments to cope with layout changes across devices
|
2014-07-18 12:50:22 +10:00 |
|
Will Marshall
|
a2da7f7ede
|
Merge branch 'caching' into new_cart
Conflicts:
app/serializers/api/variant_serializer.rb
|
2014-07-18 11:23:25 +10:00 |
|
Will Marshall
|
562f8dbd4e
|
Starting to restructure data injection
|
2014-07-18 11:21:51 +10:00 |
|
summerscope
|
957c8cf89b
|
Markup changes to all the partials for new shopfront page design
|
2014-07-17 17:24:54 +10:00 |
|
summerscope
|
7cb0e079ab
|
Lots of changes for new shopfront design
|
2014-07-17 17:24:31 +10:00 |
|
summerscope
|
730373d677
|
Making all the images optimised - as wee as can be!
|
2014-07-17 17:24:14 +10:00 |
|
summerscope
|
1c3da6c003
|
Adding pretty design assets for new shopfront page
|
2014-07-17 17:23:45 +10:00 |
|
Will Marshall
|
33611ddb20
|
Renaming Product to Products and starting to figure out cart
|
2014-07-17 15:04:39 +10:00 |
|
Will Marshall
|
67922f38df
|
Fixing some regressions to data submission
|
2014-07-17 14:46:46 +10:00 |
|
Rohan Mitchell
|
08409dad0a
|
Fix down migration - need explicit cast for string -> integer
|
2014-07-17 14:43:34 +10:00 |
|
Rafael Schouten
|
98d824f09b
|
use string for postcode
|
2014-07-17 14:31:51 +10:00 |
|
Will Marshall
|
541fe9ec37
|
Switching Checkout service to use CurrentOrder
|
2014-07-17 14:26:54 +10:00 |
|
Rohan Mitchell
|
b326ec8a3c
|
Remove landing page images
|
2014-07-17 14:26:46 +10:00 |
|