Will Marshall 74211cbfc7 Merge branch 'master' into fixing_modals ...

Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl

2014-05-29 11:14:16 +10:00

..

active_table_search.css.sass

Renaming ID to make it more generic to table search rather than Hub

2014-05-06 17:55:38 +10:00

active_table.css.sass

Restyling active nodes for producer and hub

2014-05-08 17:10:28 +10:00

all.scss

Revert "Styling for shop page product modal"

2014-05-24 09:12:24 +10:00

branding.css.sass

Adding a menu style and styling around the new top nav

2014-05-06 16:10:02 +10:00

checkout.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

footer.sass

Make small size generic not specific to footer

2014-05-09 14:34:42 +10:00

forms.css.sass

Styling for shopping cart page

2014-05-20 15:50:03 +10:00

groups.css.sass

Tweaks to styling on groups page

2014-05-27 18:03:12 +10:00

header.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

home_panes.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

home_tagline.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

home.css.sass

Starting to prettify with Laura

2014-04-22 15:46:14 +10:00

hub_node.css.sass

Restyling active nodes for producer and hub

2014-05-08 17:10:28 +10:00

hubs.css.sass

Changing color naming convention and updating all stylesheets

2014-04-29 12:37:49 +10:00

lists.css.sass

More prettification

2014-04-22 17:08:40 +10:00

login-modal.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

menu.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

mixins.sass

Adding in links to homepage buttons for Groups & Producers

2014-05-28 12:21:25 +10:00

overrides.css.sass

Revert "Styling for shop page product modal"

2014-05-24 09:12:24 +10:00

producer_node.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

producers.css.sass

Refactor friday - tidying up and commenting css

2014-05-14 15:55:18 +10:00

product_table.css.sass

Reworking the shop page

2014-05-16 10:23:31 +10:00

shop.css.sass

Revert "Styling for shop page product modal"

2014-05-24 09:12:24 +10:00

shopping-cart.css.sass

Styling for shopping cart page

2014-05-20 15:50:03 +10:00

sidebar.css.sass

Adding a menu style and styling around the new top nav

2014-05-06 16:10:02 +10:00

tables.css.sass

Basic Darkswarm version of the Order Confirmation page

2014-03-14 16:11:40 +11:00

tabs.css.sass

Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.

2014-05-14 15:55:19 +10:00

typography.css.sass

Update styling on empty cart

2014-05-20 16:40:23 +10:00

ui.css.sass

Add new font into buttons

2014-05-14 15:55:19 +10:00

variables.css.sass

Refactor friday - tidying up and commenting css

2014-05-14 15:55:18 +10:00