Skip to content

/ ghostery-extension

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

Jump to bottom

Onboarding spreadsheet bugs #38 (GH-2259), #44 (GH-2306), and #45 (GH-2305) #675

Merged
merged 16 commits into from Mar 17, 2021
+472 −113
Merged

Onboarding spreadsheet bugs #38 (GH-2259), #44 (GH-2306), and #45 (GH-2305) #675

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb30c6a
Expand toggle and select plus plan if user is basic and selects ghost…
benstrumeyer Feb 2, 2021
6c964ec
Make ghostery glow icon bigger in select default search modal
benstrumeyer Feb 2, 2021
fe1225c
Move ghostery logo on search option selection container a little to t…
benstrumeyer Feb 2, 2021
ae11985
Remove expansion by default
benstrumeyer Feb 2, 2021
a570063
Merge branch 'develop' into misc-fixes
benstrumeyer Feb 8, 2021
31793f8
Update logo sizes on choose default search view
benstrumeyer Feb 8, 2021
2b4009f
Adjust sizing for Yahoo, Startpage, and Bing logos in search selectio…
wlycdgr Feb 9, 2021
b318fbe
Increase chance user object is available before choose plan view rend…
wlycdgr Feb 9, 2021
e253c7f
Factor out option card checkmark item rendering to a helper to reduce…
wlycdgr Feb 9, 2021
19a71d9
Merge in develop
wlycdgr Mar 15, 2021
72f1451
Update test snapshots
wlycdgr Mar 15, 2021
0bd2e3b
Refactor choose plan view plan card feature copy rendering to a helpe…
wlycdgr Mar 15, 2021
b9a1c83
Factor user status checks in select plan view out to helpers to reduc…
wlycdgr Mar 15, 2021
c00e26f
Move setting of default plan in plan select view to componentDidMount…
wlycdgr Mar 15, 2021
43ebda7
Merge in develop
wlycdgr Mar 16, 2021
7af8bc5
Revised setDefaultPlan() logic in ChoosePlanView to make sure everyth…
wlycdgr Mar 16, 2021
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Merge branch 'develop' into misc-fixes

  • Loading branch information
@benstrumeyer
benstrumeyer committed Feb 8, 2021
commit a5700633596f6d8db8e6f821dddb4266587e33c4
4 app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
View file
Open in desktop
@@ -240,7 +240,7 @@ class ChooseDefaultSearchView extends Component {
renderOptionContainer = (chosenSearch, optionName) => {
const selected = (chosenSearch === optionName);
const containerClasses = ClassNames('ChooseSearchView__optionContainer', { selected });
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${optionName.toLocaleLowerCase()}.svg`;
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${optionName.toLocaleLowerCase().replace(' ', '')}.svg`;
const optionDescriptionContainerClassNames = ClassNames('ChooseSearchView__optionDescriptionContainer', {
ghostery: optionName === SEARCH_GHOSTERY
});
@@ -278,7 +278,7 @@ class ChooseDefaultSearchView extends Component {

renderConfirmationModal = () => {
const { searchBeingConsidered, otherSearchSelected } = this.state;
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${searchBeingConsidered.toLocaleLowerCase()}.svg`;
const logoFilename = `/app/images/hub/ChooseDefaultSearchView/search-engine-logo-${searchBeingConsidered.toLocaleLowerCase().replace(' ', '')}.svg`;
const modalOptionLogoClassNames = ClassNames('ChooseSearchView__modalOptionLogo', {
ghostery: searchBeingConsidered === SEARCH_GHOSTERY
});
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.