Skip to content

Commit

Permalink
change the mixin headline to also support 38px for fontsize and also …
Browse files Browse the repository at this point in the history
…add a label mixin (#112)
  • Loading branch information
niceoutput authored and mmelo committed Apr 13, 2017
1 parent 880cc2b commit e71b2c5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uniq",
"version": "2.2.4",
"version": "2.2.5",
"description": "Internal CSS Framework/Toolkit used @ Uniplaces",
"main": [
"src/styles/**/*",
Expand Down
14 changes: 12 additions & 2 deletions src/styles/_common/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ $small: em(9px);
color: color('text','title');
}

@mixin headline() {
@mixin headline($isBig:false) {
@include font("IntervalNextReg");
font-size: $headline;
@if $isBig {
font-size: em(38px);
} @else {
font-size: $headline;
}
color: color('text','title');

&--light {
Expand Down Expand Up @@ -76,3 +80,9 @@ $small: em(9px);
color: color('anchor', 'alternative');
}
}

@mixin label() {
font-size: em(16px);
@include font("IntervalNextReg");
color: color("input", "label");
}

0 comments on commit e71b2c5

Please sign in to comment.