Rohan Mitchell eac22df200 Merge branch 'master' into redesign ...

Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml

2015-05-13 09:53:20 +10:00

..

_brandstory.html.haml

WIP: Fix apostrophes, add TODO

2015-05-07 15:03:27 +10:00

_cta1.html.haml

Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.

2015-05-06 14:54:16 +10:00

_cta2.html.haml

Style shops signup page

2015-05-12 13:51:31 +10:00

_fat.html.haml

bind-once on hubs

2015-05-03 14:11:09 +10:00

_filters.html.haml

Hiding filters on list views because styling is broken

2015-04-24 19:35:18 +10:00

_hubs.html.haml

fix visible bug

2014-10-17 03:59:48 +11:00

_login.html.haml

Getting the darkswarm build flow up and running. Like a boss

2013-12-04 13:09:30 +11:00

_signup.html.haml

Fixed id duplication for login and sign up forms.

2013-08-14 11:12:36 +10:00

_skinny.html.haml

bind-once on hubs

2015-05-03 14:11:09 +10:00

_stats.html.haml

Style home page stats pane

2015-05-12 11:33:07 +10:00

_system.html.haml

Add friendly icons for home systems pane

2015-05-12 10:45:42 +10:00

index.html.haml

Extract transparent button style, use on home tagline and CTA2

2015-05-12 10:14:47 +10:00