-
Notifications
You must be signed in to change notification settings - Fork 349
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
Make proxy & nativeMessaging permissions optional #2225
Merged
Merged
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
09d9b05
Make nativeMessaging and proxy permissions optional
lesleyjanenorton 6635994
Start updates to to options.html
lesleyjanenorton ef662cd
Show permission warning in advanced proxy panel
lesleyjanenorton 5a2e631
Gate MozillaVPN tout on enabled permissions in edit container panels
lesleyjanenorton ed63f18
Lint roll
lesleyjanenorton 1b165ae
Handle proxy and nativeMessaging permission disabling + enabling
lesleyjanenorton c146a0b
Move the permission observers in the background scripts
bakulf ca861e2
Permission handlers triggered on add and on remove
bakulf 07d7b0c
Make the linter happy again
bakulf 3c3b5ae
Add Mozilla VPN & Proxy permissions block to options.html
lesleyjanenorton 396411f
Update panel
lesleyjanenorton 2fbb3e0
Hide Mozilla VPN proxy flags when proxy permission is disabled
lesleyjanenorton 567a284
Update options page to latest UX
lesleyjanenorton 8e51ea0
Add ability to enable permissions from Mozilla VPN + Proxy onboarding…
lesleyjanenorton 1f5245b
Update options page when permissions change (Jira 682, 686, 680)
lesleyjanenorton dc7b5ca
Add sumo link to options page
lesleyjanenorton 2361fc7
Fix Windows UI edge cases (Jira - 683)
lesleyjanenorton c914096
Use localized string
lesleyjanenorton 29d5863
Fix onboarding panel buttons on Windows
lesleyjanenorton cbcae35
Use 'inline-size' instead of 'width'
lesleyjanenorton e87be3d
Fix MAC-689
lesleyjanenorton 478a6db
Address review comment
lesleyjanenorton f544f41
Fix travis builds
bakulf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,122 @@ | ||
| body { | ||
| --grey10: #e7e7e7; | ||
|
|
||
| font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; | ||
| background: #fff; | ||
| color: #202023; | ||
| color: rgb(74, 74, 79); | ||
| font-size: 13px; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| h3 { | ||
| h3:first-of-type { | ||
| margin-block-start: 2.5rem; | ||
| } | ||
|
|
||
| h3:first-of-type { | ||
| margin-block-start: 1rem; | ||
| label { | ||
| display: flex; | ||
| align-items: center; | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| p, | ||
| label { | ||
| color: rgb(74, 74, 79); | ||
| label > span { | ||
| padding-inline-end: 4px; | ||
| } | ||
|
|
||
| .settings-group { | ||
| margin-block-end: 16px; | ||
| } | ||
|
|
||
| form { | ||
| display: flex; | ||
| flex-direction: column; | ||
| padding-block-end: 1rem; | ||
| } | ||
|
|
||
| .settings-group p { | ||
| margin-inline-start: 24px; | ||
| margin-block: 4px 8px; | ||
| } | ||
|
|
||
| input[type="checkbox"] { | ||
| margin-inline: 0 8px; | ||
| margin-block: 1px auto; | ||
| inline-size: 16px; | ||
| block-size: 16px; | ||
| } | ||
|
|
||
| button { | ||
| margin-inline: 0 auto; | ||
| } | ||
|
|
||
| .keyboard-shortcut { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| max-inline-size: 70%; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .bold { | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .moz-vpn-proxy-permissions { | ||
| margin-block: 0 2rem; | ||
| padding-block-end: 1rem; | ||
| border-block-end: 1px solid var(--grey10); | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| h3.moz-vpn-proxy-permissions-title { | ||
| margin-block-start: 0; | ||
| position: relative; | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .warning-icon { | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .warning-icon.show-warning::before { | ||
| background-image: url("/img/warning.svg"); | ||
| background-size: 24px; | ||
| background-repeat: no-repeat; | ||
| background-position: center; | ||
| content: ""; | ||
| display: block; | ||
| block-size: 24px; | ||
| inline-size: 24px; | ||
| margin-inline-end: 0.5rem; | ||
| } | ||
|
|
||
| .moz-vpn-proxy-permissions-title::before, | ||
| .moz-vpn-proxy-permissions-title::after { | ||
| background-color: var(--grey10); | ||
| content: ""; | ||
| height: 1px; | ||
| flex: 1 1 0%; | ||
| } | ||
|
|
||
| h3.moz-vpn-proxy-permissions-title::before { | ||
| margin-inline-end: 2rem; | ||
| margin-inline-start: -50%; | ||
| } | ||
|
|
||
| h3.moz-vpn-proxy-permissions-title::after { | ||
| margin-inline-start: 2rem; | ||
| margin-inline-end: -50%; | ||
| } | ||
|
|
||
| @media (prefers-color-scheme: dark) { | ||
| body { | ||
| background: #202023; | ||
| background: #23212a; | ||
| color: #fff; | ||
| } | ||
|
|
||
| p, | ||
| label { | ||
| p { | ||
| color: rgb(177, 177, 179); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
system-uiis the equivalent of-apple-systemon Linux, and results in the same font that's used by the current desktop theme by default.