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-2213: Step 3 - Fix setting ghostery as default search #679

Merged
merged 4 commits into from Feb 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

@@ -13,7 +13,7 @@

export const SET_DEFAULT_SEARCH = 'SET_DEFAULT_SEARCH';
export const DAWN_SETUP_NUMBER_FOR_UNLISTED_OR_RENAMED_SEARCH = 0;
export const SEARCH_GHOSTERY = 'Ghostery';
export const SEARCH_GHOSTERY = 'Ghostery Glow';
export const SEARCH_BING = 'Bing';
export const SEARCH_YAHOO = 'Yahoo';
export const SEARCH_STARTPAGE = 'Startpage';
@@ -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`;

return (
<div
@@ -275,7 +275,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`;

return (
<Modal show>
@@ -67,7 +67,7 @@ $medium-large-breakpoint: 1118px; // Break when 3 cards on the screen overflow t
height: 36px;
width: 166px;
margin: 65px auto 0 auto;
background-image: url('/app/images/hub/ChooseDefaultSearchView/search-engine-logo-ghostery.svg');
background-image: url('/app/images/hub/ChooseDefaultSearchView/search-engine-logo-ghosteryglow.svg');
}
.ChoosePlanView__adFree {
margin: 16px auto 0 auto;
ProTip! Use n and p to navigate between commits in a pull request.