-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[K7] Font sizing, weights, families and mixins (#12879)
Sets up mixins and placeholders for typography.
- Loading branch information
Showing
8 changed files
with
149 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
@import 'naming'; | ||
@import 'responsive'; | ||
@import 'typography'; |
63 changes: 63 additions & 0 deletions
63
ui_framework/components/global_styles/mixins/_typography.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
// Some mixins that help us deal with browser scaling of text more consistantly. | ||
// Essentially, fonts across kui should scale agains the root html element, not | ||
// against parent inheritance. | ||
|
||
|
||
// Typography mixins | ||
|
||
@function convertToRem($size) { | ||
@return #{$size / $kuiFontSize}rem; | ||
} | ||
|
||
// Spit out rem and px. This helps out people who might be on older versions of IE (<11). | ||
|
||
@mixin fontSize($size: $kuiFontSize) { | ||
font-size: $size; | ||
font-size: convertToRem($size); | ||
} | ||
|
||
%kuiFont { | ||
font-family: $kuiFontFamily; | ||
font-weight: $kuiFontWeightRegular; | ||
} | ||
|
||
%kuiCodeFont { | ||
font-family: $kuiCodeFontFamily; | ||
} | ||
|
||
// Font sizing extends, using rem mixin | ||
|
||
%kuiFontSize { | ||
@include fontSize($kuiFontSize); | ||
line-height: $kuiLineHeight; | ||
} | ||
|
||
%kuiFontSizeXS { | ||
@include fontSize($kuiFontSizeXS); | ||
line-height: $kuiLineHeight; | ||
} | ||
|
||
%kuiFontSizeS { | ||
@include fontSize($kuiFontSizeS); | ||
line-height: $kuiLineHeight; | ||
} | ||
|
||
%kuiFontSizeM { | ||
@include fontSize($kuiFontSizeM); | ||
line-height: $kuiLineHeight; | ||
} | ||
|
||
%kuiFontSizeL { | ||
@include fontSize($kuiFontSizeL); | ||
line-height: $kuiLineHeight * 1.5; | ||
} | ||
|
||
%kuiFontSizeXL { | ||
@include fontSize($kuiFontSizeXL); | ||
line-height: $kuiLineHeight * 2; | ||
} | ||
|
||
%kuiFontSizeXXL { | ||
@include fontSize($kuiFontSizeXXL); | ||
line-height: $kuiLineHeight * 3; | ||
} |
16 changes: 0 additions & 16 deletions
16
ui_framework/components/global_styles/variables/_font.scss
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
ui_framework/components/global_styles/variables/_typography.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// Font | ||
|
||
// Families | ||
$kuiFontFamily: "Roboto", Helvetica, Arial, sans-serif; | ||
$kuiCodeFontFamily: "Roboto Mono", monospace; | ||
|
||
// Font sizes | ||
$kuiFontSize: $kuiSize; | ||
|
||
$kuiFontSizeXS: 12px; | ||
$kuiFontSizeS: 14px; | ||
$kuiFontSizeM: $kuiFontSize; | ||
$kuiFontSizeL: 24px; | ||
$kuiFontSizeXL: 32px; | ||
$kuiFontSizeXXL: 48px; | ||
|
||
// Line height | ||
|
||
$kuiLineHeight: 1.5 * $kuiFontSize; | ||
|
||
// Font weights | ||
|
||
$kuiFontWeightLight: 300; | ||
$kuiFontWeightRegular: 400; | ||
$kuiFontWeightMedium: 500; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/** | ||
* Adapted from Eric Meyer's reset (http://meyerweb.com/eric/tools/css/reset/, v2.0 | 20110126). | ||
* | ||
*/ | ||
* { | ||
border-box: box-sizing; } | ||
|
||
html, body, div, span, applet, object, iframe, | ||
h1, h2, h3, h4, h5, h6, p, blockquote, pre, | ||
a, abbr, acronym, address, big, cite, code, | ||
del, dfn, em, img, ins, kbd, q, s, samp, | ||
small, strike, strong, sub, sup, tt, var, | ||
b, u, i, center, | ||
dl, dt, dd, ol, ul, li, | ||
fieldset, form, label, legend, | ||
table, caption, tbody, tfoot, thead, tr, th, td, | ||
article, aside, canvas, details, embed, | ||
figure, figcaption, footer, header, hgroup, | ||
menu, nav, output, ruby, section, summary, | ||
time, mark, audio, video { | ||
margin: 0; | ||
padding: 0; | ||
border: 0; | ||
font-size: 100%; | ||
font: inherit; | ||
vertical-align: baseline; } | ||
|
||
/* HTML5 display-role reset for older browsers */ | ||
article, aside, details, figcaption, figure, | ||
footer, header, hgroup, menu, nav, section { | ||
display: block; } | ||
|
||
body { | ||
line-height: 1; } | ||
|
||
ol, ul { | ||
list-style: none; } | ||
|
||
blockquote, q { | ||
quotes: none; } | ||
|
||
blockquote:before, blockquote:after, | ||
q:before, q:after { | ||
content: ''; | ||
content: none; } | ||
|
||
table { | ||
border-collapse: collapse; | ||
border-spacing: 0; } |