From ee2e2d2c57d4607692630d62214fe20f20f29e5d Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 20 Oct 2014 14:50:43 -0700 Subject: [PATCH 1/4] Fixed stray apostrophe --- views/plan/_pricing.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index c7467d90..c28d608f 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -86,7 +86,6 @@

Compare Plans

- @@ -249,7 +248,7 @@ ’ + From 2ce7620b1d89dc5cc3eded15d0623b357bd907ee Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 20 Oct 2014 15:54:11 -0700 Subject: [PATCH 2/4] Fixed some bugs with signup error popovers, changed color to red --- sass/_project-sass/_project-Header.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 3bdcf643..31807254 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -140,7 +140,6 @@ border-radius:4px 4px 0 0; @include box-shadow($signupShadow); height:700%; - overflow:hidden; position:absolute; top: -40px; @@ -200,6 +199,15 @@ } .col.col-50 { margin-left: 0; + position: static; + } + .tooltip { + &.left .tooltip-arrow { + border-left-color: #971D31; + } + .tooltip-inner { + background-color: #971D31; + } } .btn-Action{ padding:10px 25px; From d0ae9badcab83edbc0746829be9bfc5d7d6c3636 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 20 Oct 2014 16:24:09 -0700 Subject: [PATCH 3/4] Styling for bottom sign-up message, which just brings user to top of page for now --- sass/_project-sass/_project-Main.scss | 25 +++++++++++++++++++------ views/index.erb | 7 +++---- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 5b7b8e7f..143630b9 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -791,6 +791,8 @@ a.tag:hover { padding: 55px 8%; margin: 0 auto; float: left; + background: white; + width: 100%; } .section h2 { font-size: 2em; @@ -810,9 +812,8 @@ a.tag:hover { font-size: .85em; } .section.featured-Websites { - background:#971D31; + background: #971D31; padding: 30px 0; - width: 100%; position: relative; } .section.featured-Websites .nav { @@ -941,9 +942,6 @@ a.tag:hover { } } .section.plans { - background: #fff; - width: 100%; - @media(max-device-width:480px), screen and (max-width:550px) { padding: 55px 3%; } @@ -1035,7 +1033,7 @@ a.tag:hover { background-size: 70px; } .plan-chart { - margin: 2em 0 4em 0; + margin: 2em 0 0 0; width: 100%; } .plan-overview, .plan-chart { @@ -1092,6 +1090,21 @@ a.tag:hover { padding: 7px 10px; } } +.section.bottom-signup { + padding-top: 1em; + padding-bottom: 6.5em; + + a { + text-decoration: underline; + font-weight:bold; + &:hover { + text-decoration: none; + } + } + h2 { + max-width: none; + } +} .selected { font-weight: bold; } diff --git a/views/index.erb b/views/index.erb index 8b70d981..cf620b4b 100644 --- a/views/index.erb +++ b/views/index.erb @@ -39,7 +39,7 @@ - +
@@ -111,7 +111,6 @@

Neocities.org -

@@ -285,8 +284,8 @@ <%== erb :'plan/_pricing' %> -
-

What are you waiting for? Start building your web site!

+ From 1cc411f19963b4678ed38437a9315257b1aa83de Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 20 Oct 2014 16:48:44 -0700 Subject: [PATCH 4/4] Tweaks to pricing. Still need a better name for Supporter plan --- sass/_project-sass/_project-Main.scss | 2 +- views/plan/_pricing.erb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 143630b9..88d6e323 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -950,7 +950,7 @@ a.tag:hover { color:#4F7E89; } .plan-overview { - margin-top: 2.5em; + margin-top: 3.5em; margin-bottom: 2em; } .plan-overview .header { diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index c28d608f..5558e14c 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -4,10 +4,10 @@
- Personal + Free
- Supporters + Supporter
@@ -15,7 +15,7 @@
-

Free!

+

Free

$<%= Site::PLAN_FEATURES[:free][:price] %>
per month
Choose @@ -85,7 +85,7 @@
-

Compare Plans

+

Compare Plans

Custom SSL Certificates -
@@ -94,7 +94,7 @@

$<%= Site::PLAN_FEATURES[:free][:price] %>/mo

Choose -
+

Supporter

$<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo

Choose