[Themes] colorManipulator cleanup #3966
Merged
Conversation
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 started out as work to fix a bug in `lighten()` that was affecting styling in `Chip`, but it soon became apparent that there were broader issues. * Fix `lighten()` - it returned incorrect values * Simplify `lighten()` - remove default alpha (use `fade()` instead) * Fix `darken()` - it returned incorrect values, and was foobar for hsl * Fix `converColorToString()` - Correct hsl output (adds '%' where needed) * Fix `decomposeColor()` - return values as numbers not strings Previously it broke formula where addition of a number to a string * Refactor `getContrastRatio()` formula - remove conditional * Fix `getContrastRatio()` (return a number, not a string) * Remove `getContrastRatioLevel()` (dead code) * Update `getLuminance()` to support hsl * Refactor and simplfy `fade()` * Document everything, including jshint style `@param` tags * Test all the things - **44 new unit tests!**
|
This looks like it's going to be awesome 😄 |
|
Just reviewed it, apart from the one thing I mentioned on gitter (comment block) this looks good. I'll give it one more look over thought in the morning and accept it (pretty tired right now). |
Create a new function `emphasize()` which darkens a light color and lightens a dark color according to luminance. Update some styles in `getMuiTheme.js` to use the new function. Has tests.
|
@callemall/material-ui one of you give this a once over! |
|
Looking good 👍 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This started out as work to fix a bug in
lighten()that was affecting styling inChip, but it soon became apparent that there were broader issues.This PR has three commits:
[Themes] Remove default export from colorManipulator
[Themes] Overhaul colorManipulator
lighten()- it returned incorrect valueslighten()- remove default alpha (usefade()instead)darken()- it returned incorrect values, and was foobar for hslconverColorToString()- Correct hsl output (adds '%' where needed)decomposeColor()- return values as numbers not stringsPreviously it broke formula where addition of a number to a string resulted in a string ('2' + 2 = '22')
getContrastRatio()formula - remove conditionalgetContrastRatio()(return a number, not a string)getContrastRatioLevel()(dead code)getLuminance()to support hslfade()@paramtags[Themes] Move some duplicate logic out of getMuiTheme.js
emphasize()which darkens a light color and lightens a dark color according to luminance. (Will be used inChip)getMuiTheme.jsto use the new function.