summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
summerscope
75b0b290ae
More WIP trying to work on the cart template logic with Rohan
2015-03-10 14:12:43 +11:00
summerscope
c7cf9695bc
WIP on cart menu trying to add the master name back in where a product has variante
2015-03-10 11:35:35 +11:00
Rob Harrington
0a300d1802
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
2015-03-06 19:03:46 +11:00
Rob Harrington
1d80bee595
Cart item total reflects total number of items in the cart
2015-01-16 16:06:51 +11:00
Rob Harrington
2c307f09c3
Changing edit cart button to link
2015-01-16 15:47:56 +11:00
summerscope
3bd77c74a5
Improve logic on shopping cart button to add meaningful labels for various states
2015-01-16 14:57:09 +11:00
summerscope
51687b5c2c
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
2015-01-16 13:27:16 +11:00
Rob Harrington
b3e67fa164
Take two on disabled logic
2015-01-15 17:34:04 +11:00
Rohan Mitchell
b0f5d0170c
Spec that overridden price with fees appears in quick cart
2014-12-18 13:32:28 +11:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11:00
Rafael Schouten
01c98bf6e4
refactor and bugfix for tests
2014-09-17 01:07:34 +10:00
Rafael Schouten
0fa4540cec
Merge branch 'master' into currency
2014-09-11 12:09:18 +10:00
Rafael Schouten
44e9cf5ade
add currency spec file and update some class names
2014-09-10 18:22:33 +10:00
Rohan Mitchell
b49eb8fe03
Hide angular templates on page load
2014-09-10 11:50:30 +10:00
Rafael Schouten
991d0029dd
add currency localisation
2014-09-08 00:06:53 +10:00
summerscope
7d7bf7b1f2
Tweak layout for cart to make it more robust for content and allow for longer product labels
2014-08-07 12:07:35 +10:00
summerscope
1ca9c60c84
Tweak label to make a distinction between go straight to checkout and just go to shopping cart review
2014-08-06 13:18:58 +10:00
summerscope
aaae8dce2d
Move button out of UL in nesting
2014-08-06 12:57:44 +10:00
Rohan Mitchell
a1dd5dabac
Replace sleep with wait, add cart_dirty spec helper
2014-07-31 11:36:53 +10:00
Will Marshall
39a79869c0
Disabling buttons and some work on the price breakdowns, including commenting them out for now
2014-07-29 11:33:25 +10:00
summerscope
5a8fb4670f
Cart styling updates
2014-07-25 16:41:50 +10:00
Will Marshall
2120ab96ca
Fixing bugs and spec regressions
2014-07-24 16:02:10 +10:00
Will Marshall
f45dd24803
Patched up popovers for our nefarious purposes + cart pretties
2014-07-24 14:56:13 +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
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
Will Marshall
a480353158
Working bindings
2014-07-18 16:05:58 +10:00
Will Marshall
b25def810c
Working version of the cart integration
2014-07-18 14:56:15 +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
1ed634239d
Major refactoring
2014-06-20 16:31:49 +10:00
Will Marshall
21b6e91913
Moving OFN flash to fixed block
2014-06-10 12:29:31 +10:00
Will Marshall
a87361d82e
Merge branch 'master' into maps
...
Conflicts:
app/assets/javascripts/darkswarm/services/map.js.coffee
app/assets/javascripts/templates/map_modal.html.haml
app/views/layouts/darkswarm.html.haml
app/views/map/index.html.haml
app/views/shared/menu/_large_menu.html.haml
config/routes.rb
2014-06-06 17:21:27 +10:00
Will Marshall
92eca72f4f
Fixing a couple of paths and clearing localStorage when changing distributor
2014-06-06 14:04:48 +10:00
Will Marshall
82ab14a33e
Starting on on the map
2014-06-06 14:04:45 +10:00
Will Marshall
d85c89b5d2
Merge branch 'master' into maps
2014-06-05 17:12:40 +10:00
summerscope
2984cada53
Remove Admin link from left menu as this now lives in the drop-down menu for logged in users under Cog icon to right.
2014-06-05 15:51:23 +10:00
Will Marshall
1ab0d6816c
Merge branch 'laura_and_will' into maps
2014-06-05 15:50:53 +10:00
Will Marshall
476eeef69d
Starting on on the map
2014-06-05 12:18:26 +10:00
summerscope
33c276c7f7
Adding in new icon fonts to mobile menu partial
2014-06-04 16:08:16 +10:00
summerscope
122ab01ce4
Adding in new icon fonts to large menu partial
2014-06-04 16:08:02 +10:00
summerscope
498559f70d
Adding in new icon fonts to cart partial
2014-06-04 16:07:41 +10:00
summerscope
fc4e20ffd4
Adding new icons from new pretty icon font
2014-06-03 11:50:38 +10:00
summerscope
8caccfc5b0
Merge laura_and_will into icon_font
2014-05-30 17:01:49 +10:00
Will Marshall
13c6ce6786
Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty
2014-05-30 15:52:20 +10:00
summerscope
45f6a86fd2
Adding new icons to menu partials
2014-05-29 10:19:50 +10:00
Will Marshall
0b595e21d2
Showing admin for enterprise or admin user
2014-05-20 16:05:28 +10:00
Will Marshall
4e463e7087
Showing admin for enterprise or admin user
2014-05-20 15:16:52 +10:00
