From e917023fe9552600d44c0211e66b37cd7306f03a Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Fri, 17 Oct 2014 14:39:23 -0700 Subject: [PATCH 1/2] Some style and punctuation changes to pricing plans --- sass/_project-sass/_project-Main.scss | 6 ++++++ views/plan/_pricing.erb | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 96583a9c..da91d4e8 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1000,6 +1000,7 @@ a.tag:hover { .plan-chart th { background: #D6D6D6; padding: 15px 0; + font-weight: normal; } .plan-chart th.professional { background: #DAEEA5; @@ -1021,6 +1022,11 @@ a.tag:hover { border: 0; background: 0; padding-right: 15px; + + span { + border-bottom: 1px dotted #bbb; + cursor: help; + } } .plan-chart td:nth-child(even) { background: #F8F8F8; diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index b73fac15..830684d4 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -1,5 +1,5 @@
-

All Neocities plans include a neocities.org subdomain, WebDAV uploading, one-click backups, and all our social features. We'll never show ads on your site.

+

All Neocities plans include a neocities.org subdomain, WebDAV uploading, one-click backups, and all our social features. We’ll never show ads on your site.

@@ -58,7 +58,7 @@
  • Global CDN Cache
  • DDoS mitigation
  • Custom SSL Certificates
    • -
  • No upload type restrictions
    • +
  • No Upload Type Restrictions
  • Unlimited Site Creation
    • @@ -78,8 +78,8 @@
  • Global CDN Cache
  • DDoS mitigation
  • Custom SSL Certificates
    • -
  • No upload type restrictions
    • -
  • Coming Soon: Unlimited Sites
    • +
  • No Upload Type Restrictions
    • +
  • Unlimited Site Creation
    • @@ -88,7 +88,7 @@ -

    Compare Plans:

    +

    Compare Plans

    @@ -125,7 +125,7 @@ @@ -134,7 +134,7 @@ @@ -170,7 +170,7 @@ @@ -179,7 +179,7 @@ @@ -197,7 +197,7 @@ @@ -206,7 +206,7 @@ From 2a73fac5d314b5906c479f126ddb9b44ec8cc096 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Fri, 17 Oct 2014 15:57:07 -0700 Subject: [PATCH 2/2] Initial stab at making plan charts look okay at small screen sizes --- sass/_project-sass/_project-Main.scss | 26 +++++++++++++++++++++++++- views/plan/_pricing.erb | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index da91d4e8..f3fea985 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -842,9 +842,15 @@ a.tag:hover { } } -.section.features h2, .section.features h3, .section.features p { +.section.features h2, .section.features h3, .section.features p, .section.features a { color: #fff; } +.section.features a { + text-decoration: underline; + &:hover { + text-decoration: none; + } +} .section.features .fa { margin-right: 10px; } @@ -906,6 +912,7 @@ a.tag:hover { } .section.plans { background: #fff; + width: 100%; } .section.plans h2 { color:#4F7E89; @@ -997,6 +1004,14 @@ a.tag:hover { margin: 2em 0 4em 0; width: 100%; } +.plan-overview, .plan-chart { + @media(max-width:800px) { + font-size: 90%; + } + @media(max-device-width:480px), screen and (max-width:550px) { + font-size: 80%; + } +} .plan-chart th { background: #D6D6D6; padding: 15px 0; @@ -1027,6 +1042,10 @@ a.tag:hover { border-bottom: 1px dotted #bbb; cursor: help; } + + @media(max-device-width:480px), screen and (max-width:800px) { + width: 26%; + } } .plan-chart td:nth-child(even) { background: #F8F8F8; @@ -1034,6 +1053,11 @@ a.tag:hover { .plan-chart .fa-check { color: #6CCC24; } +.plan-overview .btn-Action, .plan-chart .btn-Action { + @media(max-device-width:480px), screen and (max-width:900px) { + padding: 7px 10px; + } +} .selected { font-weight: bold; } diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index 830684d4..30fd770b 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -104,12 +104,12 @@ Choose
    - Bandwidth + Bandwidth <%= Site::PLAN_FEATURES[:free][:bandwidth].to_bytes_pretty %> <%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_bytes_pretty %>
    - No advertising, ever + No advertising, ever
    - Site Tags + Site Tags
    - RSS Feed + RSS Feed
    - Site Profile + Site Profile
    - Neocities Site Editor + Neocities Site Editor -

    Cat Bus

    +

    Cat Bus

    $20/mo

    Choose     		-

    Fat Cat

    +

    Fat Cat

    $50/mo

    Choose