Add warning for low contrast and equal colors #86
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
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 |
|---|---|---|
|
|
@@ -1372,6 +1372,110 @@ const RandomTips = (function () {// eslint-disable-line no-unused-vars | |
| return me; | ||
| })(); | ||
|
|
||
| const Colors = (() => { // eslint-disable-line no-unused-vars | ||
|
There was a problem hiding this comment. Yeah, this module looks great! So for doing #20 later, everything is set. |
||
| const me = {}; | ||
|
|
||
| me.ContrastBreakpoints = { | ||
| A: 2, | ||
|
There was a problem hiding this comment. No my numbers were not all the A/AA/AAA things… But I'll change that by myself. |
||
| AA: 3, | ||
| AAA: 4.5, | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the contrast between two colors | ||
| * | ||
| * @name Colors.contrastRatio | ||
| * @function | ||
| * @param {Array} rgb1 | ||
| * @param {Array} rgb2 | ||
| * @returns {int} | ||
| */ | ||
| me.contrastRatio = function(rgb1, rgb2) { | ||
| const l1 = luminance(rgb1); | ||
| const l2 = luminance(rgb2); | ||
| // Formula: https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef | ||
| return (Math.max(l1, l2) + 0.05) / (Math.min(l1, l2) + 0.05); | ||
| }; | ||
|
|
||
| /** | ||
| * Calculates the luminance of a given RGB color. | ||
| * | ||
| * @name Colors.luminance | ||
| * @function | ||
| * @private | ||
| * @param {Array} rgb | ||
| * @returns {Array|null} | ||
| */ | ||
| function luminance(rgb) { | ||
| // Formula: https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef | ||
| let r = rgb[0] / 255; | ||
| let g = rgb[1] / 255; | ||
| let b = rgb[2] / 255; | ||
| // Note: I'm using 0.04045 here (instead of 0.03928) because 0.04045 is the | ||
| // number used in the actual sRGB standard. | ||
| // See also: https://github.com/w3c/wcag21/issues/815 | ||
| r = r < 0.04045 ? r / 12.92 : Math.pow((r + 0.055) / 1.055, 2.4); | ||
| g = g < 0.04045 ? g / 12.92 : Math.pow((g + 0.055) / 1.055, 2.4); | ||
| b = b < 0.04045 ? b / 12.92 : Math.pow((b + 0.055) / 1.055, 2.4); | ||
| return 0.2126 * r + 0.7152 * g + 0.0722 * b; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the complementary color of a given RGB array. | ||
| * | ||
| * @name Colors.invertColor | ||
| * @function | ||
| * @param {Array} rgb | ||
| * @returns {string} | ||
| */ | ||
| me.invertColor = function(rgb) { | ||
| // invert color components | ||
| const r = (255 - rgb[0]).toString(16); | ||
| const g = (255 - rgb[1]).toString(16); | ||
| const b = (255 - rgb[2]).toString(16); | ||
| // pad each with zeros and return | ||
| return `#${padZero(r)}${padZero(g)}${padZero(b)}`; | ||
| }; | ||
|
|
||
| /** | ||
| * Adds missing zeros in front of a string. | ||
| * | ||
| * @name Colors.padZero | ||
| * @function | ||
| * @private | ||
| * @param {string} string | ||
| * @param {int} length | ||
| * @returns {string} | ||
| */ | ||
| function padZero(string, length) { | ||
| length = length || 2; | ||
| const zeros = new Array(length).join("0"); | ||
| return (zeros + string).slice(-length); | ||
| } | ||
|
|
||
| /** | ||
| * Converts a hex color string to RGB. | ||
| * | ||
| * @name Colors.hexToRgb | ||
| * @function | ||
| * @param {string} hex | ||
| * @returns {Array|null} | ||
| */ | ||
| me.hexToRgb = function(hex) { | ||
| const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); | ||
| if (result) { | ||
| return [ | ||
| parseInt(result[1], 16), | ||
| parseInt(result[2], 16), | ||
| parseInt(result[3], 16) | ||
| ]; | ||
| } | ||
| return null; | ||
| }; | ||
|
|
||
| return me; | ||
| })(); | ||
|
|
||
| // init modules | ||
| AddonSettings.loadOptions(); | ||
| Logger.init(); | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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.
MAybe you can try to shorten this a bit?
Instead of calculate maybe just "Use". (That the JS has to calculate this is a technical detail the user does not even want to know. 😄)
And instead of contrast maybe contrasting color? Or something else like "best color"? Remember it does not matter to be technically 100% accurate here, the user should just know what happens when they click the button.
Theoretically it could e.g. also be okay for the user to get some color variation (i.e. not 100%ly the contrast color, but a color, which has enough contrast, so the message goes away.)