Skip to content
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

Set up sass functions folder, add new functions for color contrast #628

Merged
merged 6 commits into from
Apr 4, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,16 @@ $buttonTypes: (
// Create button modifiders based upon the map.
@each $name, $color in $buttonTypes {
.euiButton--#{$name} {
color: $color;
color: makeHighContrastColor($color, $euiColorEmptyShade);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to work for the ghost (non-fill) text color:

screen shot 2018-04-03 at 15 54 40 pm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

border-color: $color;

&.euiButton--fill {
background-color: $color;
border-color: $color;

$textColor: #FFF;
@if ($name == 'ghost') {
$textColor: #000;
} @else if (lightness($euiTextColor) > 50) {
$textColor: $euiTextColor;
}
$fillTextColor: chooseLightOrDarkText($color, #FFF, #000);

color: $textColor;
color: $fillTextColor;

&:enabled {
&:hover, &:focus {
Expand All @@ -102,7 +97,7 @@ $buttonTypes: (
}

&:disabled .euiButton__spinner {
border-color: euiLoadingSpinnerBorderColors(transparentize($textColor, .3));
border-color: euiLoadingSpinnerBorderColors(transparentize($fillTextColor, .3));
}
}

Expand Down
9 changes: 5 additions & 4 deletions src/components/call_out/_call_out.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,18 @@
$callOutTypes: (
primary: $euiColorPrimary,
success: $euiColorSecondary,
warning: adjust-hue($euiColorWarning, 20%),
warning: $euiColorWarning,
danger: $euiColorDanger,
);

// Create button modifiders based upon the map.
@each $name, $color in $callOutTypes {
.euiCallOut--#{$name} {
border-color: $color;
background-color: tintOrShade($color, 90%, 70%);
$backgroundColor: tintOrShade($color, 90%, 70%);
$textColor: makeHighContrastColor($color, $backgroundColor);

$textColor: shadeOrTint($color, 30%, 70%);
border-color: $color;
background-color: $backgroundColor;

.euiCallOutHeader__icon {
fill: $textColor;
Expand Down
4 changes: 2 additions & 2 deletions src/components/text/_text_color.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ $textColors: (
// Create color modifiers based on the map
@each $name, $color in $textColors {
.euiTextColor.euiTextColor--#{$name} {
color: $color !important;
color: makeHighContrastColor($color, $euiColorEmptyShade) !important;

// We need a blanket approach for coloring. It should overule everything.
* {
color: $color !important;
color: makeHighContrastColor($color, $euiColorEmptyShade) !important;
}
}
}
83 changes: 83 additions & 0 deletions src/global_styling/functions/_colors.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// Mixes a provided color with white.
@function tint($color, $percent) {
@return mix(#fff, $color, $percent);
}

// Mixes a provided color with black.
@function shade($color, $percent) {
@return mix(#000, $color, $percent);
}

// For theming. Checks the text color and tells us whether it's light or dark.
// Based on that we either tint (add white) or shade (add black).
@function tintOrShade($color, $tint, $shade) {
@if (lightness($euiTextColor) > 50) {
@return shade($color, $shade);
} @else {
@return tint($color, $tint);
}
}

// The reverse of the above
@function shadeOrTint($color, $shade, $tint) {
@if (lightness($euiTextColor) < 50) {
@return shade($color, $shade);
} @else {
@return tint($color, $tint);
}
}

// Calculates luminance, which is better than brightness for checking colors
// pow, nth functions come from the _math.scss functions
@function luminance($color) {
// Formula: http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
$rgba: red($color), green($color), blue($color);
$rgba2: ();

@for $i from 1 through 3 {
$rgb: nth($rgba, $i);
$rgb: $rgb / 255;

$rgb: if($rgb < .03928, $rgb / 12.92, pow(($rgb + .055) / 1.055, 2.4));

$rgba2: append($rgba2, $rgb);
}

@return .2126 * nth($rgba2, 1) + .7152 * nth($rgba2, 2) + 0.0722 * nth($rgba2, 3);
}

// Calculate contrast
@function contrastRatio($background, $foreground) {
$backgroundLum: luminance($background) + .05;
$foregroundLum: luminance($foreground) + .05;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, why the + .05?

Copy link
Contributor Author

@snide snide Apr 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef

It's part of the formula for calculating contrast ratios when given relative luminance. To be honest, I barely understand how the math works, but I did check using @debug to make sure the value calculations along the functions work against WebAIM and other supported tools.


@return max($backgroundLum, $foregroundLum) / min($backgroundLum, $foregroundLum);
}

// Compare the contrast against both light and white text, then pick the highest.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compare against 'light and dark' or 'white and black'? I'm assuming it's not supposed to be 'light and white'.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think adding example usages in the comments would be really helpful.

@function chooseLightOrDarkText($color, $light, $dark) {
$lightContrast: contrastRatio($color, white);
$darkContrast: contrastRatio($color, black);

@if ($lightContrast > $darkContrast) {
@return $light;
}
@else {
@return $dark;
}
}

// Given a color and a background, make that color AA accessibility by slightly
// adjusting it till it works
@function makeHighContrastColor($forground, $background) {
$contrast: contrastRatio($forground, $background);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sp: forground => foreground


$highContrastTextColor: $forground;

@while ($contrast < 4.5) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone more engineery might have a better way to do this, but it seems to work perfectly fine and outputs decent looking results. Basically keeps adjusting the shadeOrTint by 5% of a passed color until it gets passed 4.5.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems simple enough to me. Not sure what the load is on compilation but at 5% increments I don't think it should run too long.

$highContrastTextColor: shadeOrTint($highContrastTextColor, 5%, 5%);
$contrast: contrastRatio($highContrastTextColor, $euiColorEmptyShade);
}

@return $highContrastTextColor;
}
2 changes: 2 additions & 0 deletions src/global_styling/functions/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'math';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you just add a comment in here that 'math' needs to come first to be used in all subsequent function files?

@import 'colors';
44 changes: 44 additions & 0 deletions src/global_styling/functions/_math.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Greatest common devisor
// From: http://rosettacode.org/wiki/Greatest_common_divisor#JavaScript
@function gcd($a, $b) {
@if ($b != 0) {
@return gcd($b, $a % $b);
} @else {
@return abs($a);
}
}

// Handles decimal exponents by trying to convert them into a fraction and then
// use a nthRoot-algorithm for parts of the calculation
@function pow($base, $exponent, $prec: 12) {
@if (floor($exponent) != $exponent) {
$prec2 : pow(10, $prec);
$exponent: round($exponent * $prec2);
$denominator: gcd($exponent, $prec2);
@return nthRoot(pow($base, $exponent / $denominator), $prec2 / $denominator, $prec);
}

$value: $base;
@if $exponent > 1 {
@for $i from 2 through $exponent {
$value: $value * $base;
}
} @else if $exponent < 1 {
@for $i from 0 through -$exponent {
$value: $value / $base;
}
}

@return $value;
}

// From: http://rosettacode.org/wiki/Nth_root#JavaScript
@function nthRoot($num, $n: 2, $prec: 12) {
$x: 1;

@for $i from 0 through $prec {
$x: 1 / $n * (($n - 1) * $x + ($num / pow($x, $n - 1)));
}

@return $x;
}
1 change: 1 addition & 0 deletions src/global_styling/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Core
@import 'functions/index';
@import 'variables/index';
@import 'mixins/index';
@import 'reset/index';
30 changes: 1 addition & 29 deletions src/global_styling/variables/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
// Mixes a provided color with white.
@function tint($color, $percent) {
@return mix(#fff, $color, $percent);
}

// Mixes a provided color with black.
@function shade($color, $percent) {
@return mix(#000, $color, $percent);
}

// For theming. Checks the text color and tells us whether it's light or dark.
// Based on that we either tint or shade.
@function tintOrShade($color, $tint, $shade) {
@if (lightness($euiTextColor) > 50) {
@return shade($color, $shade);
} @else {
@return tint($color, $tint);
}
}

@function shadeOrTint($color, $shade, $tint) {
@if (lightness($euiTextColor) < 50) {
@return shade($color, $shade);
} @else {
@return tint($color, $tint);
}
}

// Core

$euiColorPrimary: #0079a5 !default;
Expand All @@ -37,7 +9,7 @@ $euiColorGhost: #FFF !default;
// Status
$euiColorSuccess: $euiColorSecondary !default;
$euiColorDanger: #A30000 !default;
$euiColorWarning: #CF3800 !default;
$euiColorWarning: #E5830E !default;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reverts back to our "yellow" color for warnings so everything looks ok again. It becomes darker through use of the functions as we need it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


// Grays
$euiColorEmptyShade: #FFF !default;
Expand Down
2 changes: 1 addition & 1 deletion src/themes/eui/eui_colors_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $euiColorDarkestShade: #F5F5F5;
$euiColorFullShade: #FFF;
$euiColorSlightHue: #494E51;
$euiColorPrimary: #4da1c0;
$euiColorWarning: #e45c29;
$euiColorWarning: #c06c4c;
$euiColorDanger: #bf4d4d;
$euiTextColor: #DDD;

Expand Down