Skip to content

Commit

Permalink
Release for v2.1.0. closes #23. closes #40
Browse files Browse the repository at this point in the history
  • Loading branch information
grayghostvisuals committed Feb 16, 2015
1 parent 5f9ed76 commit 8696fea
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 11 deletions.
11 changes: 11 additions & 0 deletions dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
**Sass v2.1.0:**

date: 2015-02-16

changes:

- [Issue 23](https://github.com/typeplate/starter-kit/issues/23) : Libsass Interpolation Issues. Thanks for the advice and tips @HugoGiraudel
- [Issue 40](https://github.com/typeplate/starter-kit/issues/40) : Backwards calculations for headings. Thanks @ramsaylanier

-------

**Sass & CSS v2.0.0:**

date: 2014-11-04
Expand Down
2 changes: 1 addition & 1 deletion dist/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typeplate-starter-kit",
"version": "2.0.0",
"version": "2.1.0",
"homepage": "http://typeplate.com",
"description": "A Typographic Starter Kit"
}
12 changes: 6 additions & 6 deletions dist/scss/_typeplate-functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// -------------------------------------//
// target / context = result
//
// @example p { font-size: context-calc(24, 16, px); }
// @example p { font-size: typl8-context-calc(24, 16, px, 18 * 1.65); }

@function typl8-context-calc($scale, $base, $value) {
@return ($scale/$base)#{$value};
@return ($scale/$base) + $value;
}


Expand All @@ -14,14 +14,14 @@
// divide 1 unit of measure by given font-size & return relative value

@function typl8-measure-margin($scale, $measure, $value) {
$pixelValue: $measure/$scale;
$pixelValue: $scale/$measure; // ($measure/$scale) issue#40 https://github.com/typeplate/starter-kit/issues/40
$remValue: $pixelValue * $typl8-font-base;

@if $value == rem {
@return $pixelValue#{$value};
@return $pixelValue + $value;
} @else if $value == em {
@return ($remValue/$scale)#{$value};
@return ($remValue/$scale) + $value;
} @else {
@return $remValue#{$value};
@return $remValue * 1px;
}
}
6 changes: 3 additions & 3 deletions dist/scss/_typeplate-mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

@mixin typl8-typescale($scale, $base, $value, $measure:"") {
@if $value == rem {
font-size: $scale#{px};
font-size: $scale * 1px;
font-size: typl8-context-calc($scale, $base, $value);
} @else if $value == em {
font-size: typl8-context-calc($scale, $base, $value);
} @else {
font-size: $scale#{px};
font-size: $scale * 1px;
}

@if $measure != "" {
Expand Down Expand Up @@ -47,7 +47,7 @@
@include typl8-typescale(
$size,
$typl8-font-base,
'#{$typl8-typescale-unit}',
$typl8-typescale-unit,
$typl8-measure
);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/scss/_typeplate.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
Typeplate : Starter Kit
URL ........... http://typeplate.com
Version ....... 2.0.0
Version ....... 2.1.0
Github ........ https://github.com/typeplate/starter-kit
Authors ....... Dennis Gaebel (@gryghostvisuals) & Zachary Kain (@zakkain)
License ....... Creative Commmons Attribution 3.0
Expand Down
Binary file modified typeplate-sk.zip
Binary file not shown.

0 comments on commit 8696fea

Please sign in to comment.