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 1593 and gh 1594/upgrade plus banner and logo #373

Merged
merged 51 commits into from Apr 26, 2019
Merged

Gh 1593 and gh 1594/upgrade plus banner and logo #373

merged 51 commits into from Apr 26, 2019

Commits on Mar 20, 2019

  1. Remove old Plus banner/logo

    @wlycdgr
    wlycdgr committed Mar 20, 2019
    b64fdae

Commits on Apr 8, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 8, 2019
    68378c6

  2. Add green upgrade banner to Summary component

    @wlycdgr
    wlycdgr committed Apr 8, 2019
    a131dfb

Commits on Apr 12, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 12, 2019
    26953b0

  2. Add upgrade banner class

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    8e409d6

  3. Fix classNames -> className typo

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    a8f4602

  4. Implement CSS for green upgrade banner

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    cd6148a

  5. Display smaller upgrade banner in summary view when on detailed tab

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    208fcd4

  6. Adjust position of smaller upgrade banner upwards a little to avoid o… 

    …verlapping the donut
    @wlycdgr
    wlycdgr committed Apr 12, 2019
    dd1de6f

  7. Add gold subscriber icon to display when a subscribed user is signed in

    @wlycdgr
    wlycdgr committed Apr 12, 2019
    ec59226

Commits on Apr 14, 2019

  1. Finish implementation of plus upgrade banner and gold icon display lo… 

    …gic for the case when the panel is not both in detailed view and expanded
    @wlycdgr
    wlycdgr committed Apr 14, 2019
    b3a380b

  2. Remove debug code and redundant variable from Summary#render

    @wlycdgr
    wlycdgr committed Apr 14, 2019
    4e0af1e

Commits on Apr 15, 2019

  1. Refactor Summary#render for clarity

    @wlycdgr
    wlycdgr committed Apr 15, 2019
    901e06e

  2. Add green upgrade banner and gold plus icon SVGs for expanded view

    @wlycdgr
    wlycdgr committed Apr 15, 2019
    5c861d9

  3. Add expanded view upgrade banner div stub to Header#render. Refactor … 

    …and clean up Header#render a bit.
    @wlycdgr
    wlycdgr committed Apr 15, 2019
    d4dedb3

Commits on Apr 16, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    c9eb688

  2. Display gold icon in expanded view if user is a logged-in subscriber

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    499051f

  3. Stub click on badge in expanded view

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    6273e6e

  4. Replicate dev behavior of badge clicking in Header in expanded view

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8c8b7fd

  5. Rename upgrade banner / gold plus badge click handler for clarity

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8e7abf1

  6. Add badge CSS classes to extended view badges. These need updating

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    dbdea1e

  7. Correct subscriber redirect path for gold plus icon click handler in … 

    …Header
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    9aedc21

  8. Update badge CSS

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    43b5e81

  9. Tweak CSS for expanded view upgrade banner and gold plus icon to spec

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    4cc227b

  10. Remove reference to non-extant state.header from header container map… 

    …StateToProps. pass state.panel.is_expanded to Header
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    8c4a316

  11. Implement show/hide logic for header upgrade banner and gold plus icon

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    740f61b

  12. Factor kebab div out to const for clarity in Header#render

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    5ebbd1e

  13. Tweak gold plus icon expanded view SVG to make sure Plus is more cent… 

    …ered, with Vinnie's approval. Refactor Header#render for clarity
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    d0c3b4f

  14. Finish clarity refactor of Summary#render

    @wlycdgr
    wlycdgr committed Apr 16, 2019
    6035749

  15. Nudge summary content down in expert view so green upgrade banner can… 

    … fit. Delete two unused scss partials
    @wlycdgr
    wlycdgr committed Apr 16, 2019
    a0170de

Commits on Apr 17, 2019

  1. Adjust positioning of simple/detailed view upgrade banners and gold i… 

    …cons to spec
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    8534297

  2. Add click handling for simple and detailed view upgrade banner and go… 

    …ld badge. Adjust CSS for them.
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    2a43fa9

  3. Switch between upgrade banner and gold icon in Summary view on sign i… 

    …n / out instead of on panel reopen
    @wlycdgr
    wlycdgr committed Apr 17, 2019
    dfb9596

Commits on Apr 18, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @IAmThePan
    IAmThePan committed Apr 18, 2019
    1f31716

  2. Decompose totalTrackersBlockedAndPageLoadTime in Summary#render

    @wlycdgr
    wlycdgr committed Apr 18, 2019
    10631ab

  3. Remove duplication from return of Summary#render

    @wlycdgr
    wlycdgr committed Apr 18, 2019
    be447e7

  4. Merge branch 'GH-1593_and_GH-1594/UpgradePlus-banner-and-logo' of git… 

    …hub.com:ghostery/ghostery-extension into GH-1593_and_GH-1594/UpgradePlus-banner-and-logo
    @wlycdgr
    wlycdgr committed Apr 18, 2019
    069fca6

  5. Fix Summary view display in Midnight theme on Detailed tab. Realign g… 

    …reen upgrade banner and gold icon accordingly. Add debug and log truebools back into manifest
    @wlycdgr
    wlycdgr committed Apr 18, 2019
    c38b4b5

Commits on Apr 19, 2019

  1. Display subscriber badge in header in gold in Midnight theme

    @wlycdgr
    wlycdgr committed Apr 19, 2019
    ce7158b

  2. Add upgrade banner text to locale strings file. Remove SVG upgarde te… 

    …xt. Replace it with a text span.
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    80a1736

  3. Finalize CSS for upgrade banner text. Delete duplicate upgrade banner… 

    … SVG
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    26c6ab0

  4. Convert 'upgrade to' text in the green banner from SVG to text for sm… 

    …aller detail view banner
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    de6aa6b

  5. Make sure upgrade banner or subscriber badge display in the hamburger… 

    … dropdown views
    @wlycdgr
    wlycdgr committed Apr 19, 2019
    c7a43ee

Commits on Apr 23, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @IAmThePan
    IAmThePan committed Apr 23, 2019
    ed9f928

  2. Modify upgrade banner to scale along with text that may vary in lengt… 

    …h by locale
    @wlycdgr
    wlycdgr committed Apr 23, 2019
    9aef19d

  3. Tweak scalable CSS for simple view upgrade banner

    @wlycdgr
    wlycdgr committed Apr 23, 2019
    4006174

Commits on Apr 24, 2019

  1. Dedupe upgrade banner render code. Clean up CSS. Make sure banners st… 

    …retch in both detailed and summary views.
    @wlycdgr
    wlycdgr committed Apr 24, 2019
    43b5988

  2. Merge in develop & resolve conflict in Summary.jsx

    @wlycdgr
    wlycdgr committed Apr 24, 2019
    2affa53

  3. Restore mistakenly deleted gold Plus icon CSS

    @wlycdgr
    wlycdgr committed Apr 24, 2019
    56e607a

  4. Fix Summary view alignment in Condensed mode

    @wlycdgr
    wlycdgr committed Apr 24, 2019
    bbae8e7

Commits on Apr 26, 2019

  1. Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

    …d-logo
    @IAmThePan
    IAmThePan committed Apr 26, 2019
    88759ba