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

GH-1975 Theme Framework & GH-1972 Palm Theme #517

Closed
wants to merge 22 commits into from
+85,412 −237
Closed

GH-1975 Theme Framework & GH-1972 Palm Theme #517

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
317ab64
Replace themes toggle with radio buttons
benstrumeyer Mar 11, 2020
f050b83
Center inner circle in radio buttons
benstrumeyer Mar 11, 2020
e8d7f92
Merge branch 'develop' into GH-1967/themes-panel-update
benstrumeyer Mar 12, 2020
f9b1546
Remove console error
benstrumeyer Mar 12, 2020
a9a12aa
Testing switching between themes
benstrumeyer Mar 18, 2020
fc61494
Add configuration that points to local account server
benstrumeyer Mar 18, 2020
05a37b3
Initial checkin
zarembsky Mar 19, 2020
0e0beef
Adding local themes
zarembsky Mar 19, 2020
8a66ff9
Adding comments.
zarembsky Mar 19, 2020
1ff8eb4
Fix (sort of)
zarembsky Mar 19, 2020
60cfc91
Real fix
zarembsky Mar 19, 2020
05f8718
Remove unneeded call
zarembsky Mar 19, 2020
824b2a3
Create theme framework and palm theme
benstrumeyer Mar 26, 2020
d36fd1a
Create palm theme svgs
benstrumeyer Mar 26, 2020
260c627
Add antiTracking, adBlocking and smartBlocking tracker counts to Cliq…
benstrumeyer Mar 26, 2020
8660643
Merge branch 'develop' into palm-theme
benstrumeyer Mar 26, 2020
1b2cb00
Delete bugs.json
benstrumeyer Mar 26, 2020
5183da7
Delete surrogates.json
benstrumeyer Mar 26, 2020
45f9562
Delete compatibility.json
benstrumeyer Mar 26, 2020
3e3b4fa
Delete click2play.json
benstrumeyer Mar 26, 2020
536dd74
Remove console logs
benstrumeyer Mar 26, 2020
d9e06f5
Merge branch 'palm-theme' of github.com:ghostery/ghostery-extension i…
benstrumeyer Mar 26, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…
Remove console error
  • Loading branch information
@benstrumeyer
benstrumeyer committed Mar 12, 2020
commit f9b154628d18d30ee46099f397b0340b30a0cf74
4 app/panel/components/BuildingBlocks/RadioButtonGroup.jsx
View file
Open in desktop
@@ -50,12 +50,12 @@ class RadioButtonGroup extends React.Component {
const { buttons } = this.state;
return (
this.props.items.map((item, index) => (
<div className="flex-container align-justify RadioButtonGroup__container">
<div className="flex-container align-justify RadioButtonGroup__container" key={`${index * 2}`}>

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Mar 27, 2020
Member

React docs advise against using array indices as keys if there's another unique identifier available. Can we use the labels?

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Mar 31, 2020
Author Contributor

Yes we can!
<span className="RadioButtonGroup__label">
{t(item.text)}
</span>
<div>
<RadioButton key={buttons[index]} checked={buttons[index]} handleClick={() => this.handleClick(index)} />
<RadioButton checked={buttons[index]} handleClick={() => this.handleClick(index)} />
</div>
</div>
))
1 app/scss/panel.scss
View file
Open in desktop
@@ -8,6 +8,7 @@
* https://www.ghostery.com/
*
* Copyright 2019 Ghostery, Inc. All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0
ProTip! Use n and p to navigate between commits in a pull request.