diff options
| author | Sam Potts <sam@potts.es> | 2017-12-20 15:32:16 +0000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2017-12-20 15:32:16 +0000 |
| commit | 6bc3592381c3b6743dbd16ec353f03fd518a04a5 (patch) | |
| tree | c76c24f1b7c7f3f3bd9bd143694c256d073f9d94 /demo/src | |
| parent | 6864149989c6a5b1bb6e9199e1f8af062c64dcc4 (diff) | |
| download | plyr-6bc3592381c3b6743dbd16ec353f03fd518a04a5.tar.lz plyr-6bc3592381c3b6743dbd16ec353f03fd518a04a5.tar.xz plyr-6bc3592381c3b6743dbd16ec353f03fd518a04a5.zip | |
Fix for rounding
Diffstat (limited to 'demo/src')
| -rw-r--r-- | demo/src/sass/lib/decimal.scss | 79 | ||||
| -rw-r--r-- | demo/src/sass/lib/mixins.scss | 11 |
2 files changed, 7 insertions, 83 deletions
diff --git a/demo/src/sass/lib/decimal.scss b/demo/src/sass/lib/decimal.scss deleted file mode 100644 index 8cb41718..00000000 --- a/demo/src/sass/lib/decimal.scss +++ /dev/null @@ -1,79 +0,0 @@ -// _decimal.scss | MIT License | gist.github.com/terkel/4373420 - -// Round a number to specified digits. -// -// @param {Number} $number A number to round -// @param {Number} [$digits:0] Digits to output -// @param {String} [$mode:round] (round|ceil|floor) How to round a number -// @return {Number} A rounded number -// @example -// decimal-round(0.333) => 0 -// decimal-round(0.333, 1) => 0.3 -// decimal-round(0.333, 2) => 0.33 -// decimal-round(0.666) => 1 -// decimal-round(0.666, 1) => 0.7 -// decimal-round(0.666, 2) => 0.67 -// -@function decimal-round ($number, $digits: 0, $mode: round) { - $n: 1; - // $number must be a number - @if type-of($number) != number { - @warn '#{ $number } is not a number.'; - @return $number; - } - // $digits must be a unitless number - @if type-of($digits) != number { - @warn '#{ $digits } is not a number.'; - @return $number; - } @else if not unitless($digits) { - @warn '#{ $digits } has a unit.'; - @return $number; - } - @for $i from 1 through $digits { - $n: $n * 10; - } - @if $mode == round { - @return round($number * $n) / $n; - } @else if $mode == ceil { - @return ceil($number * $n) / $n; - } @else if $mode == floor { - @return floor($number * $n) / $n; - } @else { - @warn '#{ $mode } is undefined keyword.'; - @return $number; - } -} - -// Ceil a number to specified digits. -// -// @param {Number} $number A number to round -// @param {Number} [$digits:0] Digits to output -// @return {Number} A ceiled number -// @example -// decimal-ceil(0.333) => 1 -// decimal-ceil(0.333, 1) => 0.4 -// decimal-ceil(0.333, 2) => 0.34 -// decimal-ceil(0.666) => 1 -// decimal-ceil(0.666, 1) => 0.7 -// decimal-ceil(0.666, 2) => 0.67 -// -@function decimal-ceil ($number, $digits: 0) { - @return decimal-round($number, $digits, ceil); -} - -// Floor a number to specified digits. -// -// @param {Number} $number A number to round -// @param {Number} [$digits:0] Digits to output -// @return {Number} A floored number -// @example -// decimal-floor(0.333) => 0 -// decimal-floor(0.333, 1) => 0.3 -// decimal-floor(0.333, 2) => 0.33 -// decimal-floor(0.666) => 0 -// decimal-floor(0.666, 1) => 0.6 -// decimal-floor(0.666, 2) => 0.66 -// -@function decimal-floor ($number, $digits: 0) { - @return decimal-round($number, $digits, floor); -} diff --git a/demo/src/sass/lib/mixins.scss b/demo/src/sass/lib/mixins.scss index ef155b46..cdfcb87d 100644 --- a/demo/src/sass/lib/mixins.scss +++ b/demo/src/sass/lib/mixins.scss @@ -31,11 +31,14 @@ // Use rems for font sizing // Leave <body> at 100%/16px // --------------------------------------- -@mixin font-size($font-size: 16) { - $rem: decimal-round(($font-size / 16), 3); +@function calculate-rem($size) { + $rem: $size / 16; + @return #{$rem}rem; +} - font-size: ($font-size * 1px); - font-size: '#{$rem}rem'; +@mixin font-size($size: 16) { + font-size: $size * 1px; // Fallback in px + font-size: calculate-rem($size); } // Font smoothing |