Skip to content

Commit

Permalink
Forgot to commit 🙃
Browse files Browse the repository at this point in the history
  • Loading branch information
scottkellum committed Oct 1, 2018
1 parent aa7549e commit 98470f0
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modular-scale",
"version": "v3.0.7",
"version": "v3.0.8",
"main": [
"stylesheets/_modularscale.scss"
],
Expand Down
6 changes: 5 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Version 3.0.8

* Fix issues with removal of rounding, sorry folks.

# Version 3.0.7

* Remove rounding errors.
* Remove rounding.

# Version 3.0.6

Expand Down
2 changes: 1 addition & 1 deletion lib/modular-scale.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# a prerelease version
# Date is in the form of YYYY-MM-DD
module ModularScale
VERSION = "3.0.7"
VERSION = "3.0.8"
DATE = "2018-09-27"
end

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modularscale-sass",
"version": "3.0.7",
"version": "3.0.8",
"description": "A tool to help web designers size their type in a more meaningful way.",
"main": "stylesheets/_modularscale.scss",
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions stylesheets/_modularscale.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import 'modularscale/sort';
@import 'modularscale/target';
@import 'modularscale/function';
@import 'modularscale/round-px';

// Mixins
@import 'modularscale/respond';
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/modularscale/_function.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

// Fast calc if not multi stranded
@if(length($base) == 1) {
@return ms-round-px(ms-pow($ratio, $v) * $base);
@return ms-pow($ratio, $v) * $base;
}

// Create new base array
Expand Down
7 changes: 7 additions & 0 deletions stylesheets/modularscale/_round-px.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@function ms-round-px($r) {
@if unit($r) == 'px' {
@return round($r);
}
@warn "ms-round-px is no longer used by modular scale and will be removed in the 3.1.0 release.";
@return $r;
}

0 comments on commit 98470f0

Please sign in to comment.