Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2264: Align plan select boxes #699

Merged
merged 2 commits into from Mar 22, 2021
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev

Make plan cards same size when Basic user chooses Glow to match specs…

… & improve appearance. Tweak some margins on Default Search and Choose Plan views to match specs and improve appearance.
  • Loading branch information
wlycdgr committed Mar 22, 2021
commit fee8a343c706d0ac472eefc3d2e8305e4ef231fe
@@ -51,13 +51,14 @@
}

.ChooseSearchView__subtitle {
margin-bottom: 47px;
margin-bottom: 12px;
text-align: center;
}

.ChooseSearchView__optionsContainer {
display: grid;
grid-template-columns: 1fr 1fr;
margin-bottom: 15px;
}


@@ -222,9 +222,11 @@ class ChoosePlanView extends React.Component {
</div>
</div>
{showCTAButton && (
<NavLink className="ChoosePlanView__searchCTAButton" to="/onboarding/5" onClick={() => setSetupStep({ setup_step: CHOOSE_PLAN, dawn_setup_number: PLUS_SUBSCRIBER_KEEP_SUBSCRIPTION, origin: ONBOARDING })}>
<span>{t('ghostery_dawn_onboarding_keep')}</span>
</NavLink>
<div className="ChoosePlanView__searchCTAButtonContainer">
<NavLink className="ChoosePlanView__searchCTAButton" to="/onboarding/5" onClick={() => setSetupStep({ setup_step: CHOOSE_PLAN, dawn_setup_number: PLUS_SUBSCRIBER_KEEP_SUBSCRIPTION, origin: ONBOARDING })}>
<span>{t('ghostery_dawn_onboarding_keep')}</span>
</NavLink>
</div>
)}
</Fragment>
);
@@ -266,7 +268,9 @@ class ChoosePlanView extends React.Component {
</div>
</div>
{showCTAButton && (
<a className="ChoosePlanView__premiumCTAButton" href={premiumCheckoutLink} target="_blank" rel="noreferrer" onClick={() => this.setSetupStepAndMoveToSuccessView(PLUS_SUBSCRIBER_PREMIUM_SUBSCRIPTION)}>{t('ghostery_dawn_onboarding_upgrade')}</a>
<div className="ChoosePlanView__searchCTAButtonContainer">
<a className="ChoosePlanView__premiumCTAButton" href={premiumCheckoutLink} target="_blank" rel="noreferrer" onClick={() => this.setSetupStepAndMoveToSuccessView(PLUS_SUBSCRIBER_PREMIUM_SUBSCRIPTION)}>{t('ghostery_dawn_onboarding_upgrade')}</a>
</div>
)}
</Fragment>
);
@@ -12,6 +12,7 @@
*/

$medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow to next line
$plan-card-width: 250px;

.ChoosePlanView {
margin: 45px auto 0 auto;
@@ -62,7 +63,7 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
.ChoosePlanView__searchPromoContainer {
width: 354px;
height: 381px;
margin: 48px auto 0 auto;
margin: 48px auto;
border-radius: 4px;
border: solid 4px $ghosty-blue;
}
@@ -103,10 +104,11 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
}

.ChoosePlanView__searchCTAButton {
display: flex;
justify-content: center;
margin: 48px auto 0 auto;
min-height: 44px;
min-width: 162px;
max-width: $plan-card-width;
padding: 7.7px 14px;
line-height: 22px;
background: linear-gradient(
@@ -138,9 +140,9 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
.ChoosePlanView__premiumCTAButton {
display: flex;
justify-content: center;
margin: 48px auto 0 auto;
height: 44px;
width: 162px;
min-width: 162px;
max-width: $plan-card-width;
padding: 7.7px 14px;
line-height: 22px;
background: linear-gradient(
@@ -205,6 +207,11 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
}
.ChoosePlanView__keepOrUpgradeContainer {
margin: 40px auto;

.ChoosePlanView__cardOuter {
height: 680px;
margin-bottom: rem-calc(50);
}
}
.ChoosePlanView__arrow {
margin: 15px auto 0 auto;
@@ -224,7 +231,7 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
.ChoosePlanView__card {
height: 100%;
box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.5);
margin-bottom: rem-calc(40);
margin-bottom: rem-calc(50);
width: 250px;
margin-left: auto;
margin-right: auto;
ProTip! Use n and p to navigate between commits in a pull request.