From 27d71a71e6cdec80a0fd7028dabbf28d3b6da00f Mon Sep 17 00:00:00 2001 From: CJ Date: Wed, 18 Jun 2014 01:11:34 +0800 Subject: [PATCH 1/2] Reformated membership page for @elfgoh; Non-responsive for now; --- contents/membership/_index/main.markdown | 54 ++++++++++++++++-------- templates/css/bootstrap.cosmo.css | 23 ++++++++++ 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/contents/membership/_index/main.markdown b/contents/membership/_index/main.markdown index ec62beff..ffe4a03b 100644 --- a/contents/membership/_index/main.markdown +++ b/contents/membership/_index/main.markdown @@ -2,27 +2,45 @@ ## Membership Tiers -### Resident — $512 SGD monthly - -A reserved desk for co-working. You can keep your stuff at the desk. We'll -label a desk with your name, in honour of your contribution. - -### Hotdesk — $256 SGD monthly - -Priority at desks whenever you drop by the space (oversubscription may occur at -peak hours, we aim for 90% availability). You cannot keep your crap at the -desk. - -### Regular Member — $128 SGD monthly - + + + + + + + + + + + + + + + + +
+Resident + +Hotdesk Priority + +Hotdesk Regular +
+

$512 SGD

/monthly +
+

$256 SGD

/monthly +
+

$128 SGD

/monthly +
+A reserved desk for co-working. You can keep your stuff at the desk. +We'll label a desk with your name, in honour of your contribution. + +Priority at desks whenever you drop by the space (oversubscription may occur at peak hours, we aim for 90% availability). +You cannot keep your crap at the desk. + Use any of the open desks. Hang out on the sofas. Keep your crap in a locker (rental applies). Use the workbench. Borrow books from our library. Keep your toys and tools onsite. +
-### Broke Member — $64 SGD monthly - -If you are a student or a starving hacker, all the benefits of regular -membership at a reduced rate. Also, if you really want to support the space, but -don't come by regularly. ## How do I sign up? diff --git a/templates/css/bootstrap.cosmo.css b/templates/css/bootstrap.cosmo.css index ccddca23..e2990a1d 100644 --- a/templates/css/bootstrap.cosmo.css +++ b/templates/css/bootstrap.cosmo.css @@ -6474,3 +6474,26 @@ a.list-group-item-danger.active:focus { .popover { color: #333333; } + +p, blockquote p +{ + line-height: 1.5em; +} +.membership-tiers +{ + margin-top: 1.5em; +} +.membership-tiers th +{ + text-align: center; +} +.membership-tiers-tr-2 +{ + vertical-align: top; +} +.membership-tiers-tr-2 td +{ + width: 32%; + text-align: center; + padding-bottom: 1em; +} \ No newline at end of file From 748c099d13034e039d63ceaa7e267c1152540ef8 Mon Sep 17 00:00:00 2001 From: CJ Date: Wed, 18 Jun 2014 16:59:32 +0800 Subject: [PATCH 2/2] Moved all changes to cosmo.css into styles.less as per @Valentine's pointers; --- templates/css/bootstrap.cosmo.css | 23 ----------------------- templates/css/styles.less | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/templates/css/bootstrap.cosmo.css b/templates/css/bootstrap.cosmo.css index e2990a1d..ccddca23 100644 --- a/templates/css/bootstrap.cosmo.css +++ b/templates/css/bootstrap.cosmo.css @@ -6474,26 +6474,3 @@ a.list-group-item-danger.active:focus { .popover { color: #333333; } - -p, blockquote p -{ - line-height: 1.5em; -} -.membership-tiers -{ - margin-top: 1.5em; -} -.membership-tiers th -{ - text-align: center; -} -.membership-tiers-tr-2 -{ - vertical-align: top; -} -.membership-tiers-tr-2 td -{ - width: 32%; - text-align: center; - padding-bottom: 1em; -} \ No newline at end of file diff --git a/templates/css/styles.less b/templates/css/styles.less index 121fd0a6..9d610ddc 100644 --- a/templates/css/styles.less +++ b/templates/css/styles.less @@ -146,3 +146,26 @@ img { background-color: rgba(255, 255, 255, .4); padding: 1em; } + +p, blockquote p +{ + line-height: 1.5em; +} +.membership-tiers +{ + margin-top: 1.5em; + th + { + text-align: center; + } +} +.membership-tiers-tr-2 +{ + vertical-align: top; + td + { + width: 32%; + text-align: center; + padding-bottom: 1em; + } +}