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 |
|
Rohan Mitchell
|
845509b0c0
|
Style shops signup page
|
2015-05-12 13:51:31 +10:00 |
|
Rohan Mitchell
|
5a43c80231
|
Convert tabs to spaces
|
2015-05-12 12:26:35 +10:00 |
|
Rohan Mitchell
|
4e0478bbe9
|
Update copy and spacing on hubs page
|
2015-05-12 11:59:51 +10:00 |
|
Rohan Mitchell
|
d261ea617a
|
A little more space between header and button
|
2015-05-12 11:50:40 +10:00 |
|
Rohan Mitchell
|
f416503bde
|
Tighten up footer lock
|
2015-05-12 11:49:45 +10:00 |
|
Rohan Mitchell
|
0184925ac8
|
Switch out footer logo for logo with no text
|
2015-05-12 11:41:49 +10:00 |
|
Rohan Mitchell
|
ebc452b1e2
|
Style home page stats pane
|
2015-05-12 11:33:07 +10:00 |
|
Rohan Mitchell
|
7b36f9dbf8
|
Add friendly icons for home systems pane
|
2015-05-12 10:45:42 +10:00 |
|
Rohan Mitchell
|
b2f687cd11
|
Style home panes (all except stats)
|
2015-05-12 10:21:52 +10:00 |
|
Rohan Mitchell
|
5a63353004
|
Extract transparent button style, use on home tagline and CTA2
|
2015-05-12 10:14:47 +10:00 |
|
Rohan Mitchell
|
7c37b4783a
|
Avoid adding top padding on mobile menu
|
2015-05-12 10:10:52 +10:00 |
|
Rohan Mitchell
|
8178076dd2
|
Use more subtle background for tile image
|
2015-05-12 10:09:14 +10:00 |
|
Rohan Mitchell
|
25aede1bdf
|
Brighten landscape home hero image
|
2015-05-12 10:08:39 +10:00 |
|
Rohan Mitchell
|
b2d8d9fdfd
|
Make nav menu centered, logo a little larger
|
2015-05-11 17:32:02 +10:00 |
|
Rohan Mitchell
|
fec375fbea
|
Decrease padding on brand story
|
2015-05-11 16:52:39 +10:00 |
|
Rohan Mitchell
|
5498d03660
|
Add zoomed-in tile
|
2015-05-11 16:52:01 +10:00 |
|
Rohan Mitchell
|
82334036d1
|
Orange-styled tile
|
2015-05-11 16:43:53 +10:00 |
|
Rohan Mitchell
|
fa6b0fac3f
|
Add landscape hero image
|
2015-05-11 16:36:26 +10:00 |
|
Rohan Mitchell
|
f99333dbd5
|
Remove trailing whitespace
|
2015-05-11 16:35:50 +10:00 |
|
Rohan Mitchell
|
9ee6ef06da
|
Return logo to smaller size
This reverts commit 460d0c9907.
|
2015-05-11 16:14:30 +10:00 |
|
Rohan Mitchell
|
460d0c9907
|
Increase size of logo to fill page above the fold. Remove cta1 pane.
|
2015-05-11 15:53:46 +10:00 |
|
Rohan Mitchell
|
14afe932c1
|
Resize menu logo, make it always fully opaque
|
2015-05-11 14:39:53 +10:00 |
|
Rohan Mitchell
|
978c176cf6
|
Remove filter on hero image, set up superimposed logo and shop now CTA
|
2015-05-11 14:37:28 +10:00 |
|
Rohan Mitchell
|
3e82deb1f5
|
Add new home hero images
|
2015-05-11 14:32:07 +10:00 |
|
Rohan Mitchell
|
8cb8aacefe
|
Switch logo for white menu
|
2015-05-08 16:07:59 +10:00 |
|
Rohan Mitchell
|
6fc9789477
|
Invert colours on top menu
|
2015-05-08 15:11:54 +10:00 |
|
Rohan Mitchell
|
6322fdc1f0
|
Disable top alert
|
2015-05-08 15:03:37 +10:00 |
|
Rohan Mitchell
|
e8c8d8885c
|
Merge branch 'master' into single-order-patches
|
2015-05-08 12:42:56 +10:00 |
|
Rohan Mitchell
|
768c9f24a2
|
Make topbar height configurable
|
2015-05-08 11:22:55 +10:00 |
|
Rohan Mitchell
|
a450d3af81
|
Variables can now be used to override foundation vars
|
2015-05-08 11:15:27 +10:00 |
|
Rohan Mitchell
|
f6c1be97a8
|
WIP: Fix apostrophes, add TODO
|
2015-05-07 15:03:27 +10:00 |
|
Rohan Mitchell
|
bd6bac8874
|
Display deployment output in real time
This reverts commit 485eee4bdd.
|
2015-05-06 20:02:22 +10:00 |
|
Rohan Mitchell
|
50d2ddc05f
|
Add progress comments
|
2015-05-06 20:00:50 +10:00 |
|
Rohan Mitchell
|
10b7a86745
|
Add debugging to merge script
|
2015-05-06 19:50:06 +10:00 |
|
Rohan Mitchell
|
6d33dc5070
|
Add script to merge master into the current branch if required before running specs
|
2015-05-06 19:41:36 +10:00 |
|
Rohan Mitchell
|
d109e898d2
|
Preserve newlines when displaying deploy script output
|
2015-05-06 19:38:20 +10:00 |
|
Rohan Mitchell
|
3dee29cd12
|
Remove build badge - master branch is always green
|
2015-05-06 19:37:21 +10:00 |
|
Rohan Mitchell
|
0921cd2dfa
|
Merge branch 'master' into single-order-patches
|
2015-05-06 18:13:55 +10:00 |
|
Rohan Mitchell
|
7b4130972b
|
Fix first feature spec sometimes timing out
|
2015-05-06 18:12:17 +10:00 |
|
Rohan Mitchell
|
485eee4bdd
|
Deploy scripts display their output
|
2015-05-06 18:07:50 +10:00 |
|
Rohan Mitchell
|
f84e704d99
|
Retry simple push-to-master script
|
2015-05-06 17:59:36 +10:00 |
|
Rohan Mitchell
|
ad7e5a45bb
|
Add updated merge script
|
2015-05-06 17:58:36 +10:00 |
|
Rohan Mitchell
|
d9404d3332
|
Merge branch 'master' into single-order-patches
|
2015-05-06 17:29:23 +10:00 |
|
Rohan Mitchell
|
f024f62970
|
Content-manage footer fields
|
2015-05-06 16:36:10 +10:00 |
|
Rohan Mitchell
|
bf435a8f3d
|
Make home page what's happening text and about URL configurable
|
2015-05-06 15:17:28 +10:00 |
|
Rohan Mitchell
|
01d1e84f85
|
Update global links
|
2015-05-06 15:15:09 +10:00 |
|
Rohan Mitchell
|
e43d726b97
|
Merge branch 'master' into payments-report-fix
|
2015-05-06 14:55:10 +10:00 |
|
Rohan Mitchell
|
b5a6f9c1bc
|
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
|
2015-05-06 14:54:16 +10:00 |
|
Rohan Mitchell
|
1ffba674b3
|
Show real stats on home page
|
2015-05-06 14:54:16 +10:00 |
|