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-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567

Merged
merged 142 commits into from Jun 25, 2020
+1,699 −66
Merged

GH-2066, GH-2068, GH-2069, GH-2082, GH-2067 Upgrade Plan panel subscription content #567

Changes from 1 commit
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
901c4fa
Show premium subscribers a premium badge in simple/detailed views, he…
benstrumeyer May 7, 2020
f944c6c
Use api version 2.1.0 to get multiple subscriptions
benstrumeyer May 7, 2020
e035e69
Add hover effect for premium icon in menu
benstrumeyer May 7, 2020
659749b
Use css as single source of truth for icon colors
benstrumeyer May 7, 2020
2a83d42
Handle case where a user has multiple subscriptions and display Premi…
benstrumeyer May 7, 2020
de02e6c
Display subscription name
benstrumeyer May 8, 2020
53378f0
Remove duplicate locale string
benstrumeyer May 8, 2020
a10bd6c
Handle case where user only has a premium subscription and clicks the…
benstrumeyer May 8, 2020
7e552d2
Refactor code
benstrumeyer May 8, 2020
eb43832
Merge branch 'develop' into GH-2048
benstrumeyer May 8, 2020
9eb39bd
Refactor subscriber badge css classes, image paths and comments
benstrumeyer May 11, 2020
2d2aa90
Fix account#getUserSubscriptionData behavior
benstrumeyer May 11, 2020
9383ab6
Add subscriptionsPremium property to user object to check if a user h…
benstrumeyer May 11, 2020
f7b36a9
Refactor Header component to use subscriptionsPremium property
benstrumeyer May 11, 2020
f545e7b
Add newline
benstrumeyer May 11, 2020
2fcc862
Refactor svg template literal
benstrumeyer May 11, 2020
ef91547
Refactor account#getUserSubscriptionData to return an array of subscr…
benstrumeyer May 12, 2020
4fc3f53
Pass object that allows destructuring of subscriptionData
benstrumeyer May 12, 2020
2a9ffcb
Add return statement after callbacks
benstrumeyer May 12, 2020
f120d4d
Add guard to account#_setSubscriptionData to prevent overriding premi…
benstrumeyer May 12, 2020
7fe5a24
Give user subscriptionsPlus bool if they have either plus or premium …
benstrumeyer May 12, 2020
33c506a
Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p…
benstrumeyer May 12, 2020
0586ff5
Set subscription property on user object with highest tier subscripti…
benstrumeyer May 12, 2020
a77797c
Refactor menu upsell icon to use user.subscriber instead of plusAcces…
benstrumeyer May 12, 2020
1816764
test
benstrumeyer May 12, 2020
0847e49
Refactor Header logo and menu icon to use subscription instead of pre…
benstrumeyer May 13, 2020
d25d313
Rename subscriber variable to subscription
benstrumeyer May 13, 2020
c9ad1de
Refactor subscriber badge to use plusAccess and premiumAccess on clic…
benstrumeyer May 13, 2020
6398be1
Check if user object exists before accessing subscription property
benstrumeyer May 13, 2020
eb337bc
Display UI elements basedd off user scope
benstrumeyer May 13, 2020
3d51fd0
Remove unused subscription property on user
benstrumeyer May 13, 2020
23e5eb7
Base menu icon off of plusAccess and premiumAccess
benstrumeyer May 13, 2020
49eb749
Refactor isPlus to hasPlusAccess, destructure some things, and save s…
benstrumeyer May 13, 2020
47f1cd5
Use panel#hasPlusAccess() directly
benstrumeyer May 13, 2020
ead0930
Fix menu icon link
benstrumeyer May 14, 2020
cf73693
Add description and button for upgrade prompt
benstrumeyer May 15, 2020
01e96c8
Add shield icon without color params
benstrumeyer May 18, 2020
dd113ce
Add url-friendly-params to shield icon
benstrumeyer May 18, 2020
4bd057b
Add responsive styles for upgrade promo
benstrumeyer May 18, 2020
9e2774c
Merge branch 'GH-2048' into GH-2070
benstrumeyer May 18, 2020
c8c4606
Add purple border for non-premium users
benstrumeyer May 18, 2020
b4f891e
Update snapshot
benstrumeyer May 18, 2020
e992df0
Fix button from leaking outside the container right before hitting br…
benstrumeyer May 18, 2020
d44147f
Refactor colors
benstrumeyer May 18, 2020
5b22311
Small style changes
benstrumeyer May 18, 2020
5406aaf
Fix responsive styling for button when logged into a premium account
benstrumeyer May 19, 2020
03bdff3
Change copy
benstrumeyer May 19, 2020
bdf4f30
Remove errors from UpgradePlanView
benstrumeyer May 20, 2020
0ddb508
Remove sass errors from UpgradePlanView.scss
benstrumeyer May 20, 2020
b74ada6
Start replacing strings with messages
benstrumeyer May 20, 2020
783c7aa
Finish replacing strings with messages
benstrumeyer May 20, 2020
4e8ae40
Switch to new designs & fix breakage. Add card images and check marks
benstrumeyer Jun 3, 2020
e71ce59
Delete old designs
benstrumeyer Jun 3, 2020
01946f8
Add x icon, and table style changes
benstrumeyer Jun 8, 2020
6ace9f2
Create redux flow for UpgradePlanView
benstrumeyer Jun 8, 2020
0ddf4ce
Make slider work
benstrumeyer Jun 8, 2020
8a8859b
Change prices depending on toggle state. Remove active css classes
benstrumeyer Jun 8, 2020
81e4961
Change per month/year based on toggle state
benstrumeyer Jun 8, 2020
924b67b
Make protection level toggle
benstrumeyer Jun 8, 2020
52860da
Add premium sparkle icon to table
benstrumeyer Jun 8, 2020
3eed5d7
Add premium sparkle to table in mobile view
benstrumeyer Jun 8, 2020
a559998
Add background to card header images
benstrumeyer Jun 8, 2020
c77a0ce
Fix bug where image scrolled
benstrumeyer Jun 8, 2020
34b03c3
Add arrow that scrolls to comparison table
benstrumeyer Jun 8, 2020
d0463b5
Add scroll for mobile
benstrumeyer Jun 8, 2020
299c6b0
Add Must have Ghostery Midnight Installed note for larger screens
benstrumeyer Jun 9, 2020
ffdb8e2
Change monthly/yearly toggle label to grey if it is inactive
benstrumeyer Jun 9, 2020
7751a34
Minor style changes and make price per year absolute
benstrumeyer Jun 9, 2020
2f94cce
Change height/width of CTA buttons
benstrumeyer Jun 9, 2020
c7def0e
Add card border, toggle, midnight note, & protection description for …
benstrumeyer Jun 9, 2020
9bf2e4d
Change card sizes, table style, and margins for mobile view
benstrumeyer Jun 9, 2020
c5df6dc
Add shield menu icon
benstrumeyer Jun 9, 2020
c24f016
Change default route to UpgradePlanView
benstrumeyer Jun 9, 2020
be27fa3
Added /home to all hrefDones in hub
benstrumeyer Jun 9, 2020
14ed61b
Merge branch 'develop' into GH-2066
benstrumeyer Jun 9, 2020
117eb72
Remove premium promo modal
benstrumeyer Jun 9, 2020
5611ba2
Add premiumAccess in hub. Already Protected buttons redirect to home …
benstrumeyer Jun 9, 2020
04cc686
Change background color to gold instead of gradient
benstrumeyer Jun 9, 2020
9844933
More gradient -> gold changes
benstrumeyer Jun 9, 2020
880339d
Add translations for basic/additional/maximum
benstrumeyer Jun 9, 2020
acf2546
Missed one
benstrumeyer Jun 9, 2020
4389210
Remove debug flag from manifest.json
benstrumeyer Jun 9, 2020
f72ebc3
Change comments
benstrumeyer Jun 9, 2020
0e4bb5d
Route to home after steppedNavigation ends
benstrumeyer Jun 9, 2020
bf79481
Merge branch 'GH-2066-routes' into GH-2066
benstrumeyer Jun 9, 2020
d8a4862
Change color check marks
benstrumeyer Jun 9, 2020
5630a84
Make table show until small breakpoint
benstrumeyer Jun 9, 2020
3e41607
Remove unused css
benstrumeyer Jun 9, 2020
004c4f1
Left align table titles
benstrumeyer Jun 9, 2020
a4ad2af
Remove comments/console log
benstrumeyer Jun 9, 2020
2dc1374
Navigate to home page when clicking No on Override settings
benstrumeyer Jun 10, 2020
bb72863
Replace localized ghostery plus/premium strings with hardcoded strings
benstrumeyer Jun 11, 2020
6602cd7
Fix slider position
benstrumeyer Jun 11, 2020
7ce79bc
Switch monthly and yearly on toggle
benstrumeyer Jun 11, 2020
1861235
Hardcode strings that should not be translated
benstrumeyer Jun 11, 2020
f9d07e5
Make medium-large-breakpoint to switch to single card view
benstrumeyer Jun 11, 2020
004490a
Fix key container on medium-large-breakpoint
benstrumeyer Jun 11, 2020
53fe165
Fix more strings that shouldnt be translated. Use staging/prod links.
benstrumeyer Jun 11, 2020
a1fd992
Add blue and gold hover effects
benstrumeyer Jun 11, 2020
9f5145a
Break to mobile design at 1020px
benstrumeyer Jun 11, 2020
027289a
Add hover effects for premium buttons
benstrumeyer Jun 11, 2020
b6aad02
Switch to background position implementation for premium hover effect
benstrumeyer Jun 11, 2020
86954d9
Only keep 2 breakpoints
benstrumeyer Jun 11, 2020
664e603
Match hover transition timing for premium button
benstrumeyer Jun 12, 2020
b40a4d8
Some style changes
benstrumeyer Jun 12, 2020
ab52cee
Add intro_hub_click ping
benstrumeyer Jun 12, 2020
23898d0
Merge branch 'GH-2070' into GH-2066
benstrumeyer Jun 12, 2020
e7cefa4
Fix Upgrade Plan promo on home view
benstrumeyer Jun 12, 2020
2766aea
Add intro_hub_home_upgrade ping
benstrumeyer Jun 12, 2020
d069bc5
Add utm params
benstrumeyer Jun 12, 2020
d6997e6
Update tests
benstrumeyer Jun 12, 2020
aca8def
Update snapshot
benstrumeyer Jun 12, 2020
89b7507
Show yearly prices by default. Re-add interval query param. Destructu…
benstrumeyer Jun 15, 2020
cc141bb
Capitalize button casing as intended
benstrumeyer Jun 15, 2020
276b95d
Darken hover color for primary color buttons on Home view and plus up…
benstrumeyer Jun 15, 2020
2bd46b3
Add cursor: pointer to arrow/learn-more
benstrumeyer Jun 15, 2020
364044f
Make mobile table header sticky
benstrumeyer Jun 15, 2020
89d2a3b
Change font, capitalization, and width of buttons on large view
benstrumeyer Jun 15, 2020
74af740
Add cursor pointer to tabs on mobile view
benstrumeyer Jun 15, 2020
97cf434
Fix primary button color
benstrumeyer Jun 15, 2020
038b4fb
Fix query param
benstrumeyer Jun 15, 2020
1ad18d0
Merge branch 'develop' into GH-2066
benstrumeyer Jun 15, 2020
29fec26
Merge branch 'develop' into GH-2066
benstrumeyer Jun 15, 2020
b8cd6b5
Merge branch 'develop' into GH-2066
benstrumeyer Jun 15, 2020
47ed388
Fix merge remnant
benstrumeyer Jun 16, 2020
f1fbf67
Add newlines. Change button hover color on HomeView
benstrumeyer Jun 16, 2020
61c561a
Use - as the standard for svg filenames
benstrumeyer Jun 16, 2020
2885b55
Re-add premium promo modal code behind a flag. Move constants to file…
benstrumeyer Jun 16, 2020
6dcbe6e
Remove ternary
benstrumeyer Jun 16, 2020
1422fbd
Fade shield icon when taking a tutorial
benstrumeyer Jun 16, 2020
651e46b
Refactor checkout links
benstrumeyer Jun 16, 2020
debfc28
Remove unused shield svg
benstrumeyer Jun 16, 2020
88eaef4
Change sbt to subscription_interval
benstrumeyer Jun 16, 2020
625fb6a
Bump year and remove unused css
benstrumeyer Jun 17, 2020
529da16
Create featureMatrixRow and mobileFeatureMatrixRow render helper func…
benstrumeyer Jun 23, 2020
ed961e6
Create basicCard, plusCard, and premiumCard render helper functions
benstrumeyer Jun 23, 2020
553a4f7
Create plusCTAButton and premiumCTAButton render helper functions
benstrumeyer Jun 23, 2020
d464077
Create toggleSwitch render helper function
benstrumeyer Jun 23, 2020
d2a7da2
Replace basic, additional, and maximum with Basic, Plus, and Premium
benstrumeyer Jun 23, 2020
4b06ee1
Re-add basic translation string
benstrumeyer Jun 24, 2020
80fb9f3
Untranslate plus/premium in CTA buttons (upgrade to)
benstrumeyer Jun 24, 2020
0eb7793
Merge branch 'develop' into GH-2066
christophertino Jun 25, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Darken hover color for primary color buttons on Home view and plus up… 

…grade view
  • Loading branch information
@benstrumeyer
benstrumeyer committed Jun 15, 2020
commit 276b95d6ed5874270156092635dc8c709480ab0b
7 app/hub/Views/HomeView/HomeView.scss
View file
Open in desktop
@@ -16,6 +16,13 @@
padding-top: 45px;
padding-bottom: 25px;
color: $tundora;
.button {
&:not(.hollow):hover {
&:hover {
background-color: #0078CA;
}
}
}
This conversation was marked as resolved by wlycdgr
Comment on lines +19 to +25

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jun 16, 2020
Member

I couldn't understand quite what you intended here so I tried to simplify and I ?seem? to be getting the same behavior with

  .button {
	&:hover {
	  background-color: #0078CA;
	}
  }

If the CSS does need to be the way you have it, can you explain why please? - or if not, could you simplify it as above?

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Jun 16, 2020
Author Contributor

As mentioned in our chat, we've changed the font and border color of the hollow buttons to match the new hover color, and also removed the double hover

This comment has been minimized.

Sign in to view
@wlycdgr

wlycdgr Jun 16, 2020
Member

Great, thanks again for clarifying
}
.HomeView--bolded {
font-weight: 700;
2 app/hub/Views/UpgradePlanView/UpgradePlanView.scss
View file
Open in desktop
@@ -1,5 +1,5 @@
$price-blue: #00AEF0;
$price-blue-hover: #2e5a91;
$price-blue-hover: #0078CA;
$blue-alt: #4caeea;
$price-purple: #611b87;
$price-purple-alt: #720174;
ProTip! Use n and p to navigate between commits in a pull request.