+
{ __( 'Welcome to Jetpack Premium' ) }
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index 60b756e9437b8..c650b9160fd3b 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -124,7 +124,7 @@
margin: 0;
}
-.jp-landing__plan-iconcard-current {
+.jp-landing__plan-card-current {
h3 {
font-size: 1.5em;
width: 100%;
From e88850148912016cb78b9b2c5c5b7fcb9628da9b Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 09:58:55 +0200
Subject: [PATCH 05/12] Remove unused style
---
_inc/client/my-plan/style.scss | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index c650b9160fd3b..e667275e440f7 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -109,17 +109,10 @@
line-height: 1.25;
}
-.jp-landing-plans__header-description,
-.jp-landing-plans__header-text {
+.jp-landing-plans__header-description {
color: lighten($gray, 10%);
}
-.jp-landing-plans__header-text {
- font-size: rem( 14px );
- padding: rem( 24px ) 0;
- margin: 0;
-}
-
.jp-landing-plans__header-btn-container {
margin: 0;
}
From 1e056735e818e77187e056f0d33dc90b49e2c048 Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:00:06 +0200
Subject: [PATCH 06/12] Remove unused jp-landing-plans__header-description
---
_inc/client/my-plan/style.scss | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index e667275e440f7..c23bcf338858d 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -78,8 +78,7 @@
}
}
-.jp-landing-plans__header-title,
-.jp-landing-plans__header-description {
+.jp-landing-plans__header-title {
line-height: 1.5;
@include breakpoint( ">660px" ) {
@@ -98,21 +97,11 @@
font-size: rem( 20px );
}
-.jp-landing-plans__header-description {
- font-size: rem( 14px );
- margin: 0;
- padding-bottom: rem( 16px );
-}
-
.jp-landing-plans__header-subtitle {
font-size: rem( 16px );
line-height: 1.25;
}
-.jp-landing-plans__header-description {
- color: lighten($gray, 10%);
-}
-
.jp-landing-plans__header-btn-container {
margin: 0;
}
From 6510c6c6418c60bc0ec512b50fad2dc0b72bf510 Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:00:28 +0200
Subject: [PATCH 07/12] Remove unused jp-landing-plans__header-btn-container
class
---
_inc/client/my-plan/style.scss | 4 ----
1 file changed, 4 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index c23bcf338858d..0652ce97da294 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -102,10 +102,6 @@
line-height: 1.25;
}
-.jp-landing-plans__header-btn-container {
- margin: 0;
-}
-
.jp-landing__plan-card-current {
h3 {
font-size: 1.5em;
From 8cb14fb01136fd2aa239fe587a89c3729c40aa98 Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:02:12 +0200
Subject: [PATCH 08/12] Remove unused jp-landing-plans__header-title class
---
_inc/client/my-plan/style.scss | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index 0652ce97da294..4498f1d459004 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -78,25 +78,12 @@
}
}
-.jp-landing-plans__header-title {
- line-height: 1.5;
-
- @include breakpoint( ">660px" ) {
- text-align: center;
- }
-}
-
-.jp-landing-plans__header-title,
.jp-landing-plans__header-subtitle {
color: $white;
font-weight: 400;
margin: 0;
}
-.jp-landing-plans__header-title {
- font-size: rem( 20px );
-}
-
.jp-landing-plans__header-subtitle {
font-size: rem( 16px );
line-height: 1.25;
From c0e9fd60f187c154d3f258e5b55dcd56753f73d3 Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:02:39 +0200
Subject: [PATCH 09/12] Remove unused jp-landing-plans__header-subtitle class
---
_inc/client/my-plan/style.scss | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index 4498f1d459004..14cf54ba430ad 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -78,17 +78,6 @@
}
}
-.jp-landing-plans__header-subtitle {
- color: $white;
- font-weight: 400;
- margin: 0;
-}
-
-.jp-landing-plans__header-subtitle {
- font-size: rem( 16px );
- line-height: 1.25;
-}
-
.jp-landing__plan-card-current {
h3 {
font-size: 1.5em;
From 6d3c202d82332c88573b66ab33057e2856e2ef5f Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:04:23 +0200
Subject: [PATCH 10/12] Remove unused classes
---
_inc/client/my-plan/style.scss | 41 ----------------------------------
1 file changed, 41 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index 14cf54ba430ad..41ee04f498da3 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -37,47 +37,6 @@
}
}
-// clouds are a little hacky, but works for IE11 -jg
-.jp-landing-plans__clouds {
- position: relative;
- overflow: hidden;
- padding-top: rem( 80px );
-
- img {
- position: absolute;
- bottom: -2px;
- left: -5%;
- right: -5%;
- height: auto;
- width: 110%;
- }
-
- @include breakpoint( "<660px" ) {
- display: none;
- }
-}
-// end IE11 cloud hack
-
-.jp-landing-plans__header-col-left {
- flex-basis: 45%;
-
- @include breakpoint( ">660px" ) {
- padding-left: rem( 32px );
- }
-}
-
-.jp-landing-plans__header-col-right {
- flex-basis: 55%;
-
- @include breakpoint( ">660px" ) {
- padding: 0 rem( 32px );
- }
-
- @include breakpoint( "<660px" ) {
- text-align: center;
- }
-}
-
.jp-landing__plan-card-current {
h3 {
font-size: 1.5em;
From 7d3c89693f22da4b957e47acc7a29491684a18c4 Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:06:37 +0200
Subject: [PATCH 11/12] Remove unused classes
---
_inc/client/my-plan/style.scss | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index 41ee04f498da3..fa46739608586 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -9,34 +9,6 @@
}
}
-.jp-landing-plans__header {
- background: $gray-dark;
-
- @include breakpoint( ">660px" ) {
- padding: rem( 32px ) 0 0;
- }
-
- @include breakpoint( "<660px" ) {
- padding: rem( 32px );
- }
-}
-
-.jp-landing-plans__header-img-container {
- margin: rem( 32px ) 0 0;
- overflow: hidden;
-
- @include breakpoint( ">660px" ) {
- display: flex;
- flex-wrap: nowrap;
- flex-direction: row;
- align-items: center;
- }
-
- @include breakpoint( "<660px" ) {
- margin-bottom: 0;
- }
-}
-
.jp-landing__plan-card-current {
h3 {
font-size: 1.5em;
From 4c9859b13931fa6af7abd8b66e1a7e39fa2cfb0b Mon Sep 17 00:00:00 2001
From: Jon Surrell
Date: Wed, 22 May 2019 10:43:36 +0200
Subject: [PATCH 12/12] Ensure correct line break and placeholder display
---
_inc/client/my-plan/style.scss | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/_inc/client/my-plan/style.scss b/_inc/client/my-plan/style.scss
index fa46739608586..d87276a8fbd6b 100644
--- a/_inc/client/my-plan/style.scss
+++ b/_inc/client/my-plan/style.scss
@@ -10,9 +10,22 @@
}
.jp-landing__plan-card-current {
+ // Force a break by including full-width psuedo-element at correct position.
+ &::before {
+ content: '';
+ order: 20;
+ width: 100%;
+ }
+
h3 {
font-size: 1.5em;
- width: 100%;
+ width: 100%; // Make sure placeholder appears
+ order: 10;
+ }
+
+ .jp-landing__plan-features-text {
+ font-size: rem( 14px );
+ order: 30;
}
@include breakpoint( ">660px" ) {
@@ -27,6 +40,7 @@
}
.jp-landing__plan-features-header-checklist-cta-container {
+ order: 30;
align-self: center;
.dops-button {