-
Notifications
You must be signed in to change notification settings - Fork 413
Fix 1822: Sync container colors with Firefox container settings #2841
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,7 +69,7 @@ | |
| --icon-button-size: calc(calc(var(--block-line-separation-size) * 2) + 1.66rem); /* 20px */ | ||
| --inactive-opacity: 0.3; | ||
| --overflow-size: 1px; | ||
| --icon-fit: 8; | ||
| --icon-fit: 9; | ||
|
|
||
| background: var(--bgColor); | ||
| margin-block: 0; | ||
|
|
@@ -392,6 +392,11 @@ table { | |
| --identity-icon-color: #af51f5; | ||
| } | ||
|
|
||
| [data-identity-color="toolbar"] { | ||
| --identity-tab-color: currentColor; | ||
| --identity-icon-color: currentColor; | ||
| } | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This matches the Firefox stylesheet for the ContextualIdentity component. |
||
| [data-identity-icon="fingerprint"] { | ||
| --identity-icon: url("/img/usercontext.svg#fingerprint"); | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -824,7 +824,7 @@ | |
| const td = document.createElement("td"); | ||
| const openTabs = identity.numberOfOpenTabs || "" ; | ||
|
|
||
| // TODO get UX and content decision on how to message and block clicks to containers with Mozilla VPN proxy configs | ||
| // when Mozilla VPN app is disconnected. | ||
|
|
||
| td.innerHTML = Utils.escaped` | ||
|
|
@@ -1889,7 +1889,7 @@ | |
| return Utils.escaped`<input type="radio" value="${containerColor}" name="container-color" id="edit-container-panel-choose-color-${containerColor}" /> | ||
| <label for="edit-container-panel-choose-color-${containerColor}" class="usercontext-icon choose-color-icon" data-identity-icon="circle" data-identity-color="${containerColor}">`; | ||
| }; | ||
| const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple"]; | ||
| const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple", "toolbar"]; | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This matches the |
||
| const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color"); | ||
| colors.forEach((containerColor) => { | ||
| const templateInstance = document.createElement("div"); | ||
|
|
||
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.
This seems to just be hardcoded to match the number of colors. Each color swatch is 32 x 32px, and the panel is 320px wide, so you can fit 10 colors in a row without compromising on minimum spacing/padding on anything.
This changes it from 8 to 9 so all colors fit on the same row, and the minimum spacing is still met.