VPN-6213 (part 1): Remove explicit colors #9983
Merged
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.
Description
VPN-6213 is to refactor main theme to separate layout/spacing from the colors, and while we're at it remove explicit colors from the code.
This is going to be done as 3 PRs, stacked on top of one another:
grey20
it's a new variableborderColor
, andborderColor
is set togrey20
.For this PR - some of these color choices are pretty straightforward (looking at you, #FFFFFF and #000000), but some were slight judgement calls. I tried to match QT explicit colors (in MZAlert and another place or two) the best I could to our color scheme. The oddest looking one is on MZSubscriptionOption, the glow color. I spent a while testing different options, and think grey30 is best. The image on the left is how it currently looks in the app, the one on the right is grey30:
![](https://private-user-images.githubusercontent.com/9295855/379894407-24fa229a-9b44-424a-ac5a-21c5a5d583c8.jpeg?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkyMDM3NzAsIm5iZiI6MTczOTIwMzQ3MCwicGF0aCI6Ii85Mjk1ODU1LzM3OTg5NDQwNy0yNGZhMjI5YS05YjQ0LTQyNGEtYWM1YS0yMWM1YTVkNTgzYzguanBlZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEwVDE2MDQzMFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPThmZTUxZTYyYTRkMjI2NmFlZmNlYjZkZmE3Yjc1M2Y5MjA4NDhiYjM2ZWFhYzZhOGE0NjU3ZWJhZjExYTYwMTUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.xeq81OBFgbV8grLa4pAvHOtXRhV0l3VRuRP-YKV01nY)
![](https://private-user-images.githubusercontent.com/9295855/379894448-4482b2e7-30d6-4b82-bb5e-8b22edf65db2.jpeg?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkyMDM3NzAsIm5iZiI6MTczOTIwMzQ3MCwicGF0aCI6Ii85Mjk1ODU1LzM3OTg5NDQ0OC00NDgyYjJlNy0zMGQ2LTRiODItYmI1ZS04YjIyZWRmNjVkYjIuanBlZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEwVDE2MDQzMFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTFlZmVjYWM4YWIwNDFkNmM2OTBhMTdkMTk1ODJkNjExYWMyNmZmMDQ0YjJlODIxMjcyM2M0ZWMxYmMwMzIyNzMmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.VMIBlrwMTYzAQhj3bICDfnUUVCft1Oh04qJIRXBQvNA)
Additionally, I only focused on client colors for this PR. Areas I found that still have some explicit color:
I'm going to ensure we have tickets filed for these first two (update: this has been filed as VPN-6681), but the final 6 are items that I don't think we need to make generalizable (so they may never get a dark mode).
Reference
VPN-6213
Checklist