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-1972: Triangle Bug on Dark Blue Theme and Update Copy Midnight Theme -> Dark Blue Theme #532

Merged
merged 5 commits into from Apr 26, 2020
Merged

GH-1972: Triangle Bug on Dark Blue Theme and Update Copy Midnight Theme -> Dark Blue Theme #532

merged 5 commits into from Apr 26, 2020

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Apr 23, 2020 •
edited

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
  • Fix triangle bug on the historical stats graph for GH-1972 for the default and midnight theme by changing fill to stroke

Tickets:
@benstrumeyer benstrumeyer added this to the 8.5.0 milestone Apr 23, 2020
@benstrumeyer benstrumeyer requested a review from Eden12345 Apr 23, 2020
@benstrumeyer benstrumeyer requested review from jsignanini and ghostery/ghostery as code owners Apr 23, 2020
@benstrumeyer benstrumeyer self-assigned this Apr 23, 2020
@benstrumeyer benstrumeyer requested a review from wlycdgr Apr 23, 2020
@benstrumeyer benstrumeyer changed the title GH-1974 Rename Midnight Theme & Fix Triangle Bug GH-1974 and GH-1972 Rename Midnight Theme & Fix Triangle Bug Apr 23, 2020
@fcjr
fcjr requested changes Apr 23, 2020
View changes
app/panel/components/Subscription/SubscriptionThemes.jsx Outdated Show resolved Hide resolved
@benstrumeyer benstrumeyer changed the title GH-1974 and GH-1972 Rename Midnight Theme & Fix Triangle Bug GH-1972 Fix Triangle Bug Apr 23, 2020
@Eden12345
Eden12345 suggested changes Apr 23, 2020
View changes
Copy link
Contributor

@Eden12345 Eden12345 left a comment

Looks like you removed the copy update when changing the name back to midnight-theme so the API call would work properly
@benstrumeyer
Update comments and text from midnight -> dark blue
Loading status checks…
c1ed9f8
@benstrumeyer benstrumeyer requested review from Eden12345 and fcjr Apr 23, 2020
@Eden12345
Eden12345 approved these changes Apr 23, 2020
View changes
Copy link
Contributor

@Eden12345 Eden12345 left a comment

As @benstrumeyer noted, the fix for the Palm and Leaf themes are in this PR: https://github.com/ghostery/account/pull/116
@fcjr fcjr changed the title GH-1972 Fix Triangle Bug GH-1972: Fix Copy Midnight Theme -> Dark Blue Theme Apr 23, 2020
@fcjr fcjr changed the title GH-1972: Fix Copy Midnight Theme -> Dark Blue Theme GH-1972: Triangle Bug on Dark Blue Theme and Update Copy Midnight Theme -> Dark Blue Theme Apr 23, 2020
@fcjr
fcjr approved these changes Apr 23, 2020
View changes
@fcjr
Copy link
Member

@fcjr fcjr commented Apr 24, 2020 •
edited

Account PR has been approved & merged.
@christophertino
Merge branch 'develop' into GH-1974/fix
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
62a62b3
@christophertino christophertino merged commit a44f8ae into develop Apr 26, 2020
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@christophertino christophertino deleted the GH-1974/fix branch Apr 26, 2020
@benstrumeyer
Fix triangle bug for default and midnight theme
9532393
@benstrumeyer
Rename midnight theme to dark blue theme
Loading status checks…
f7f11f2
@benstrumeyer
Revert "Rename midnight theme to dark blue theme"
Loading status checks…
6c41fd5 
This reverts commit f7f11f2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcjr fcjr

@Eden12345 Eden12345

@jsignanini jsignanini

@wlycdgr wlycdgr

Assignees

@benstrumeyer benstrumeyer

Labels
Type: Bug
Projects
None yet
Milestone
8.5.0
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@benstrumeyer @fcjr @Eden12345 @christophertino