aboutsummaryrefslogtreecommitdiff
path: root/scss/_functions.scss
diff options
context:
space:
mode:
authorgijsbotje <[email protected]>2017-09-13 17:32:44 +0200
committergijsbotje <[email protected]>2017-09-13 17:32:44 +0200
commitcc092272eefa0e89bebfc716c8df8214d2804c77 (patch)
treed0197492c2d344982651a4c5dfe49ed95b15a94f /scss/_functions.scss
parentcf004433e0312482a8c4918d559f38c19a3e14d9 (diff)
downloadbootstrap-cc092272eefa0e89bebfc716c8df8214d2804c77.tar.xz
bootstrap-cc092272eefa0e89bebfc716c8df8214d2804c77.zip
modified the yiq to to an actual function
function only returns a value, not the attribute itself updated every use of the former mixin to use the new function
Diffstat (limited to 'scss/_functions.scss')
-rw-r--r--scss/_functions.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/scss/_functions.scss b/scss/_functions.scss
index a63680aa5..bbb015d07 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -49,7 +49,7 @@
}
// Color contrast
-@mixin color-yiq($color) {
+@function color-yiq($color) {
$r: red($color);
$g: green($color);
$b: blue($color);
@@ -57,9 +57,9 @@
$yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
@if ($yiq >= 150) {
- color: #111;
+ @return #111;
} @else {
- color: #fff;
+ @return #fff;
}
}