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-2218: Browser Onboarding Copy Edits & Tooltips #652

Merged
merged 6 commits into from Jan 5, 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

@@ -1819,7 +1819,7 @@
"message": "Ad free"
},
"ghostery_browser_hub_onboarding_supports_ghosterys_mission": {
"message": "Supports Ghostery's Mission"
"message": "Supports Ghostery's mission"
},
"ghostery_browser_hub_onboarding_unlimited_bandwidth": {
"message": "Unlimited Bandwidth"
@@ -1854,32 +1854,17 @@
"ghostery_browser_hub_onboarding_skip": {
"message": "Skip"
},
"ghostery_browser_hub_onboarding_back": {
"message": "Back"
},
"ghostery_browser_hub_onboarding_we_take_your_privacy_very_seriously": {
"message": "We take your privacy very seriously. Learn more"
},
"ghostery_browser_hub_onboarding_private_by_design": {
"message": "Private by design"
},
"ghostery_browser_hub_onboarding_private_by_design_description": {
"message": "Privacy is incredibly important to us at Ghostery and we've taken extra care to design our products that limits the amount of personal information collected."
},
"ghostery_browser_hub_onboarding_why_do_you_need_my_email": {
"message": "Why do you need my email?"
},
"ghostery_browser_hub_onboarding_why_do_you_need_my_email_description": {
"message": "We've found email is the simplest way to create and secure a unique account without sharing your information. It helps sync your custom settings across your devices."
},
"ghostery_browser_hub_onboarding_what_do_you_use_my_email_for": {
"message": "What do you use my email for?"
},
"ghostery_browser_hub_onboarding_what_do_you_use_my_email_for_description": {
"message": "We never share or sell your personal information. Your email address is used for account management, technical support, product-related communications, and some opt-in features."
},
"ghostery_browser_hub_onboarding_how_secure_is_": {
"message": "How secure is"
},
"ghostery_browser_hub_onboarding_how_secure_is_ghostery_description": {
"message": "We never share or sell your personal information. Your email address is used for account management, technical support, product-related communications, and some opt-in features."
"message": "Privacy is incredibly important to us at Ghostery. That’s why we enforce a strict policy when it comes to your data. When you create an account at Ghostery, the only data we collect is your name and email. This information allows us to offer you a user experience wherein you can sync your settings across devices and hear from us about important updates. Under no circumstances do we share or sell this data with any kind of third party."
},
"ghostery_browser_hub_onboarding_can_i_remove_my_account": {
"message": "Can I remove my account?"
@@ -1896,11 +1881,11 @@
"ghostery_browser_hub_onboarding_you_are_signed_in_as": {
"message": "You are signed in as"
},
"ghostery_browser_hub_onboarding_yay_youre_all_set": {
"message": "Yay! You're all set."
"ghostery_browser_hub_onboarding_youve_successfully_set_up_your_browser": {
"message": "You've successfully set up your browser!"
},
"ghostery_browser_hub_onboarding_start_browsing_the_web_with": {
"message": "Start browsing the web with"
"ghostery_browser_hub_onboarding_surf_with_ease": {
"message": "Now you can surf with the greatest of ease."
},
"ghostery_browser_hub_onboarding_lets_search": {
"message": "Let's search"
@@ -1935,16 +1920,46 @@
"ghostery_browser_hub_onboarding_question_smart_browsing": {
"message": "Do you want to turn on smart-browsing?"
},
"ghostery_browser_hub_info_blocking_all": {
"ghostery_browser_hub_onboarding_info_blocking_all": {
"message": "Blocking \"all trackers\" may cause some websites to break."
},
"ghostery_browser_hub_info_anti_tracking": {
"message": "Anti-tracking anonymizes uniquely identifiable data that trackers try to collect"
"ghostery_browser_hub_onboarding_info_anti_tracking": {
"message": "Anti-tracking anonymizes uniquely identifiable data that trackers try to collect."
},
"ghostery_browser_hub_info_smart_browsing": {
"ghostery_browser_hub_onboarding_info_smart_browsing": {
"message": "Smart-browsing adjusts your blocking settings to decrease page breakage and accelerate page loads."
},
"ghostery_browser_hub_toast_error": {
"ghostery_browser_hub__onboarding_choose_your_default_search": {
"message": "Choose your default search"
},
"ghostery_browser_hub_onboarding_pick_a_default_search_engine": {
"message": "Pick a default search engine for all your searches."
},
"ghostery_browser_hub_onboarding_ad_free_private_search": {
"message": "Ad-free private search"
},
"ghostery_browser_hub_onboarding_ad_supported_private_search": {
"message": "Ad-supported private search"
},
"ghostery_browser_hub_onboarding_type_in_search_domain": {
"message": "Type in search domain"
},
"ghostery_browser_hub_onboarding_just_so_you_know": {
"message": "Just so you know:"
},
"ghostery_browser_hub_onboarding_search_engine_will_log_your_data": {
"message": "search engine will log your data and use it to serve you targeted ads."
},
"ghostery_browser_hub_onboarding_go_back": {
"message": "Go Back"
},
"ghostery_browser_hub_onboarding_confirm": {
"message": "Confirm"
},
"ghostery_browser_hub_onboarding_other": {
"message": "Other"
},
"ghostery_browser_hub_onboarding_toast_error": {
"message": "Please answer all questions"
},
"enable_when_paused": {
@@ -29,21 +29,6 @@ const faqList = [
label: t('ghostery_browser_hub_onboarding_private_by_design'),
description: t('ghostery_browser_hub_onboarding_private_by_design_description'),
},
{
icon: 'ghosty-letter.svg',
label: t('ghostery_browser_hub_onboarding_why_do_you_need_my_email'),
description: t('ghostery_browser_hub_onboarding_why_do_you_need_my_email_description'),
},
{
icon: 'ghosty-shield-letter.svg',
label: t('ghostery_browser_hub_onboarding_what_do_you_use_my_email_for'),
description: t('ghostery_browser_hub_onboarding_what_do_you_use_my_email_for_description'),
},
{
icon: 'ghosty-lock.svg',
label: `${t('ghostery_browser_hub_onboarding_how_secure_is_')} Ghostery?`,
description: t('ghostery_browser_hub_onboarding_how_secure_is_ghostery_description'),
},
{
icon: 'ghosty-box.svg',
label: t('ghostery_browser_hub_onboarding_can_i_remove_my_account'),
@@ -158,7 +158,8 @@ $color-create-account-form-error-red: #e74055;
cursor: pointer;
@include breakpoint(small down) {
margin: 39px auto 0 auto;
text-align: center;
display: flex;
justify-content: center;
float: none;
}
}
@@ -13,7 +13,7 @@

import React, { Component } from 'react';

// import Tooltip from '../../../../panel/components/Tooltip';
import Tooltip from '../../../../shared-components/Tooltip';
import RadioButton from '../../../../shared-components/RadioButton/RadioButton';
import ToggleCheckbox from '../../../../shared-components/ToggleCheckbox/ToggleCheckbox';
import { CHOOSE_DEFAULT_SEARCH, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
@@ -137,7 +137,9 @@ class BlockSettingsView extends Component {
<li className="BlockSettingsView_question">
<div className="BlockSettingsView_questionBlock">
{t('ghostery_browser_hub_onboarding_question_kinds_of_trackers')}
<div className="BlockSettingsView__infoIcon" />
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_browser_hub_info_blocking_all')} position="top" isOnboardingHub />
</div>
</div>
</li>
<div className="BlockSettingsView_answerBlock">
@@ -159,8 +161,12 @@ class BlockSettingsView extends Component {
<div className="BlockSettingsView_answerText">{t('ghostery_browser_hub_onboarding_kinds_of_trackers_none')}</div>
</div>
<li className="BlockSettingsView_question">
{t('ghostery_browser_hub_onboarding_question_anti_tracking')}
<div className="BlockSettingsView__infoIcon" />
<div className="BlockSettingsView_questionBlock">
{t('ghostery_browser_hub_onboarding_question_anti_tracking')}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_browser_hub_info_anti_tracking')} position="top" isOnboardingHub />
</div>
</div>
</li>
<div className="BlockSettingsView_answerBlock">
<div className="BlockSettingsView__radioButtonContainer">
@@ -175,8 +181,12 @@ class BlockSettingsView extends Component {
<div className="BlockSettingsView_answerText">{t('hub_setup_modal_button_no')}</div>
</div>
<li className="BlockSettingsView_question">
{t('ghostery_browser_hub_onboarding_question_smart_browsing')}
<div className="BlockSettingsView__infoIcon" src="/app/images/hub/setup/info.svg" />
<div className="BlockSettingsView_questionBlock">
{t('ghostery_browser_hub_onboarding_question_smart_browsing')}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_browser_hub_info_smart_browsing')} position="top" isOnboardingHub />
</div>
</div>
</li>
<div className="BlockSettingsView_answerBlock">
<div className="BlockSettingsView__radioButtonContainer">
@@ -23,8 +23,8 @@ const SuccessView = (props) => {
const { sendPing } = actions;
return (
<div className="SuccessView__container">
<div className="SuccessView__title">{t('ghostery_browser_hub_onboarding_yay_youre_all_set')}</div>
<div className="SuccessView__subtitle">{`${t('ghostery_browser_hub_onboarding_start_browsing_the_web_with')} Ghostery`}</div>
<div className="SuccessView__title">{t('ghostery_browser_hub_onboarding_youve_successfully_set_up_your_browser')}</div>
<div className="SuccessView__subtitle">{`${t('ghostery_browser_hub_onboarding_surf_with_ease')}`}</div>
<img className="SuccessView__ghosterySuite" src="/app/images/hub/success/ghostery-suite.png" />
<button className="SuccessView__ctaButton" onClick={() => sendPing({ type: 'gb_onboarding_success' })} type="button">{t('ghostery_browser_hub_onboarding_lets_search')}</button>
</div>

This file was deleted.

This file was deleted.

This file was deleted.

ProTip! Use n and p to navigate between commits in a pull request.