From ac44a0419dc291a62ace8dd9d1e11c4245e29af0 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 15:33:48 -0600 Subject: [PATCH 1/2] Fix font problem with skeuocard on /welcome --- sass/_project-sass/_project-Main.scss | 2 +- views/welcome.erb | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 09745720..b90522b1 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1503,7 +1503,7 @@ a.tag:hover { .col:last-child { width: 62%; margin-top: .75em; - p { + .instructions { font-weight: bold; font-size: 100%; color: #777; diff --git a/views/welcome.erb b/views/welcome.erb index 1714c430..669b9599 100644 --- a/views/welcome.erb +++ b/views/welcome.erb @@ -1,6 +1,3 @@ -

Welcome to Neocities, <%= current_site.username %>!

Free accounts will always be free and ad-free. @@ -55,7 +52,7 @@ You can support our quest to bring back the creative, independent web by upgradi
-

To upgrade, enter your credit card info below:

+

To upgrade, enter your credit card info below:

From 2209c54fc3341dbe4c183f649c5ec4805c27adc1 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 24 Feb 2015 16:46:32 -0600 Subject: [PATCH 2/2] More tweaks to /welcome styles and copy --- sass/_project-sass/_project-Main.scss | 17 +++++++++++------ views/welcome.erb | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index b90522b1..2b31a539 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1396,7 +1396,7 @@ a.tag:hover { } } .section.plans.welcome { - padding: 55px 3%; + padding: 63px 3%; h3 { color: #5e95a1; @@ -1433,9 +1433,7 @@ a.tag:hover { } } >.row { - @media(max-device-width:480px), screen and (max-width:550px) { - margin-bottom: 0; - } + margin-bottom: 0; } .plan-overview { h3 { @@ -1487,7 +1485,7 @@ a.tag:hover { margin-bottom: 15px; .main-features { - margin-bottom: 97px; + margin-bottom: 76px; } } .col.supporter { @@ -1495,7 +1493,7 @@ a.tag:hover { background-color: #F5F5F5; border: 1px solid #E0E0E0; @include box-shadow(-1px 1px 5px 0px rgba(0,0,0,0.1)); - margin-bottom: 1.1em!important; + margin-bottom: 1.2em!important; .col:first-child { width: 38%; @@ -1507,6 +1505,13 @@ a.tag:hover { font-weight: bold; font-size: 100%; color: #777; + margin-bottom: 1em; + } + .skeuocard.js .face { + @include box-shadow(0px 1px 2px 0px rgba(0,0,0,0.25)); + &.valid { + @include box-shadow(0 0 10px #00cfa7); + } } } .btn-Action { diff --git a/views/welcome.erb b/views/welcome.erb index 669b9599..f8210e21 100644 --- a/views/welcome.erb +++ b/views/welcome.erb @@ -40,7 +40,7 @@ You can support our quest to bring back the creative, independent web by upgradi
  • <%= Site::PLAN_FEATURES[:supporter][:space].to_space_pretty %> storage
  • -
  • 1000 GB bandwidth
  • +
  • 1000 GB bandwidth
    @@ -108,7 +108,7 @@ You can support our quest to bring back the creative, independent web by upgradi

    Risk-free and secure

    -

    You can downgrade back to a free account at any time on the plan page. If you do, we’ll refund the amount you didn’t use.

    +

    You can downgrade back to a free account at any time on the Support Us page. If you do, we’ll refund the amount you didn’t use.

    We use Stripe and PayPal for payments, and never store your credit card information directly.

    @@ -118,12 +118,12 @@ You can support our quest to bring back the creative, independent web by upgradi

    Making a better web

    - When you become a supporter, you are directly helping our quest to bring back the creative, independent web, and to continue to improve Neocities for everyone. + When you become a supporter, you are directly helping our quest to bring back the creative, independent web. With your help we’ll be able to work on Neocities full-time to continue improving the site and adding more features.

    -

    Giving back

    +

    Giving back

    Neocities is used by educators all over the world to teach thousands of students how to program. And as an Open Company, our site is completely open source and we share all our code with the community.