google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making caption type default to performance font (non web font)

master
Sérgio Gomes 2014-11-03 18:17:38 +00:00
parent 274ebd8f2b
commit 3a9f25363f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/styleguide/typography/_typography.scss
View File

@ -139,7 +139,7 @@ $performance_font: 'Helvetica', 'Arial', sans-serif;
}
}
@mixin typo-caption($colorContrast: false, $usePreferred: true) {
@mixin typo-caption($colorContrast: false, $usePreferred: false) {
@include typo-preferred-font($usePreferred);
font-size: 12px;
font-weight: 400;
@ -361,10 +361,18 @@ dt {
@include typo-caption();
}
.Typography--caption--forcePreferredFont {
@include typo-caption($usePreferred: true);
}
.Typography--caption--colorContrast {
@include typo-caption($colorContrast: true);
}
.Typography--caption--forcePreferredFont--colorContrast {
@include typo-caption($colorContrast: true, $usePreferred: true);
}
.Typography--menu {
@include typo-menu();
}