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-2262, GH-2257, GH-2270: Add caret, Align link, Update copy #682

Merged
merged 5 commits into from Mar 15, 2021
Merged
Changes from all commits
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -1777,7 +1777,7 @@
"message": "We've centralized online privacy by integrating our signature as well as novel technologies."
},
"ghostery_dawn_onboarding_welcome_message": {
"message": "Our browser protects your data and blocks bloatware so that you can surf privately and over 3x faster than with Chrome."
"message": "Ghostery Dawn protects your data from trackers so that you can surf securely and up to 3x faster than with Chrome."
},
"ghostery_dawn_onboarding_lets_do_this": {
"message": "Set up My Browser"
@@ -100,6 +100,7 @@ const Step1_CreateAccountView = (props) => {
<div className="columns small-10 medium-6">
<NavLink className="Step1_CreateAccountView__skip" to="/onboarding/2" onClick={() => handleSkipButton(SKIP_ACCOUNT_CREATION)}>
<span>{t('ghostery_dawn_onboarding_skip')}</span>
<span className="Step1_CreateAccountView__arrow" />
</NavLink>
</div>
</div>
@@ -160,11 +161,14 @@ const Step1_CreateAccountView = (props) => {
{(step === LOGIN) && renderSkipLink()}
<div className="Step1_CreateAccountView__FAQContainer">
{faqList.map(item => renderFAQListItem(item.icon, item.label, item.description))}
</div>
<div className="row">
<a className="Step1_CreateAccountView__privacyPolicyLink columns small-12 medium-10 medium-offset-1 large-8 large-offset-3" href={`${globals.GHOSTERY_BASE_URL}/about-ghostery/ghostery-plans-and-products-privacy-policy/`} target="_blank" rel="noreferrer">
{t('ghostery_dawn_onboarding_visit_our_privacy_policy')}
</a>
<div className="row">
<div className="Step1_CreateAccountView__faqIconContainer columns small-12 medium-10 large-2" />
<div className="Step1_CreateAccountView__faqItemTextContainer columns small-12 medium-10 large-10">
<a className="Step1_CreateAccountView__privacyPolicyLink" href={`${globals.GHOSTERY_BASE_URL}/about-ghostery/ghostery-plans-and-products-privacy-policy/`} target="_blank" rel="noreferrer">
{t('ghostery_dawn_onboarding_visit_our_privacy_policy')}
</a>
</div>
</div>
</div>
</Fragment>
) : (
@@ -185,6 +185,8 @@ $color-create-account-form-error-red: #e74055;
.Step1_CreateAccountView__skip {
margin-top: -37px;
float: right;
display: flex;
align-items: center;
font-size: 16px;
color: $ghosty-blue;
text-decoration: underline;
@@ -196,6 +198,17 @@ $color-create-account-form-error-red: #e74055;
float: none;
}
}
.Step1_CreateAccountView__arrow {
margin-left: 5px;
float: right;
height: 10px;
width: 10px;
border-left: 2px solid $tundora;
border-top: 2px solid $tundora;
cursor: pointer;
border-color: $ghosty-blue;
transform: rotate(135deg);
}
.Step1_CreateAccountView__learnMoreContainer {
margin: 25px auto 0 auto;
width: 251px;
@@ -102,18 +102,25 @@ exports[`app/hub/Views/Step1_CreateAccountView component Snapshot tests with rea
</div>
</div>
</div>
</div>
<div
className="row"
>
<a
className="Step1_CreateAccountView__privacyPolicyLink columns small-12 medium-10 medium-offset-1 large-8 large-offset-3"
href="https://ghosterystage.com/about-ghostery/ghostery-plans-and-products-privacy-policy/"
rel="noreferrer"
target="_blank"
<div
className="row"
>
ghostery_dawn_onboarding_visit_our_privacy_policy
</a>
<div
className="Step1_CreateAccountView__faqIconContainer columns small-12 medium-10 large-2"
/>
<div
className="Step1_CreateAccountView__faqItemTextContainer columns small-12 medium-10 large-10"
>
<a
className="Step1_CreateAccountView__privacyPolicyLink"
href="https://ghosterystage.com/about-ghostery/ghostery-plans-and-products-privacy-policy/"
rel="noreferrer"
target="_blank"
>
ghostery_dawn_onboarding_visit_our_privacy_policy
</a>
</div>
</div>
</div>
</div>
`;
ProTip! Use n and p to navigate between commits in a pull request.