From 55ef5a874b32cf10e8ac4a50c0ed1c31009ca677 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sun, 14 Feb 2016 14:43:33 -0600 Subject: [PATCH] fix(colors): update sass inverse color function --- ionic/util/functions.scss | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/ionic/util/functions.scss b/ionic/util/functions.scss index 03beaa1843..8105fbb209 100644 --- a/ionic/util/functions.scss +++ b/ionic/util/functions.scss @@ -2,29 +2,34 @@ // Color Functions // -------------------------------------------------- -@function inverse($color-value) { - $lightness: lightness($color-value); +@function brightness($color-value) { + @return (red($color-value) * 0.299 + green($color-value) * 0.587 + blue($color-value) * 0.114) / 255 * 100%; +} + + +@function inverse($color-value, $dark: black, $light: white) { + $brightness: brightness($color-value); $red: red($color-value); $green: green($color-value); - @if ($lightness > 65 or $green > 220 or ($red > 240 and $green > 180)) { - @return black; + @if ($brightness > 79) { + @return $dark; } - @return white; + @if ($green > 240) { + @return $dark; + } + + @if ($red > 220 and $green > 180) { + @return $dark; + } + + @return $light; } @function toolbar-button-inverse($color-value) { - $lightness: lightness($color-value); - $red: red($color-value); - $green: green($color-value); - - @if ($lightness > 65 or $green > 220 or ($red > 240 and $green > 180)) { - @return $toolbar-md-button-color; - } - - @return white; + @return inverse($color-value, $dark: $toolbar-md-button-color, $light: white); }