Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[K7] Font sizing, weights, families and mixins #12879

Merged
merged 4 commits into from
Jul 14, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion style_guides/scss_style_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ Our style guide is an extension of [Sass Guidelines by Hugo Giraudel](https://sa
## Syntax and formatting

The Sass Guidelines site recommends using RBG and HSL values to format colors, but we're using
hex values.
hex values.

## Dealing with extends

You should try never to use the extends functionality in sass. The one exception is when you are extending placeholders to help control maintainabilty. General rule: if it creates an additive selector, it's usually a bad usage of extends.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dumb question: what's an additive selector?

1 change: 1 addition & 0 deletions ui_framework/components/global_styles/mixins/_index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import 'naming';
@import 'responsive';
@import 'typography';
17 changes: 17 additions & 0 deletions ui_framework/components/global_styles/mixins/_typography.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// 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

@mixin fontSize($size: $kuiFontSize) {
font-size: $size;
font-size: convert-to-rem($size);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a comment explaining why we're using both px and rem?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And why are we calling convert-to-rem when the name of the function is convertToRem?

}
16 changes: 0 additions & 16 deletions ui_framework/components/global_styles/variables/_font.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@import 'size';
@import 'colors';
@import 'animations';
@import 'font';
@import 'typography';
@import 'borders';
@import 'shadows';
@import 'z_index';
73 changes: 73 additions & 0 deletions ui_framework/components/global_styles/variables/_typography.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// 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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these other sizes be multiples of $kuiFontSize? So if $kuiSize changes, then everything changes?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, is there a reason not to convert these variables to rem here in their definition?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to still try and account for older versions of IE since we target enterprise. the fontSize mixin basically spits out both, but I need a base pixel value to output.


// Line height

$kuiLineHeight: 1.5 * $kuiFontSize;

// Font weights

$kuiFontWeightLight: 300;
$kuiFontWeightRegular: 400;
$kuiFontWeightMedium: 500;

// Our base fonts

%kuiFont {
font-family: $kuiFontFamily;
font-weight: $kuiFontWeightRegular;
}

%kuiCodeFont {
font-family: $kuiCodeFontFamily;
}

// Font sizing extends, using rem mixin

%kuiFontSize {
font-size: rem($kuiFontSize);
line-height: $kuiLineHeight;
}

%kuiFontSizeXS {
font-size: rem($kuiFontSizeXS);
line-height: $kuiLineHeight;
}

%kuiFontSizeS {
font-size: rem($kuiFontSizeS);
line-height: $kuiLineHeight;
}

%kuiFontSizeM {
font-size: rem($kuiFontSizeM);
line-height: $kuiLineHeight;
}

%kuiFontSizeL {
font-size: rem($kuiFontSizeL);
line-height: $kuiLineHeight * 1.5;
}

%kuiFontSizeXL {
font-size: rem($kuiFontSizeXL);
line-height: $kuiLineHeight * 2;
}

%kuiFontSizeXXL {
font-size: rem($kuiFontSizeXXL);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the rem function? Where does this come from and what's the difference with convertToRem?

line-height: $kuiLineHeight * 3;
}
13 changes: 5 additions & 8 deletions ui_framework/components/global_styles/variables/_z_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Z-Index


$kuiZLevel0: 0;
$kuiZLevel1: 1000;
$kuiZLevel2: 2000;
Expand All @@ -12,10 +11,8 @@ $kuiZLevel7: 7000;
$kuiZLevel8: 8000;
$kuiZLevel9: 9000;



$kuiZContent: 0;
$kuiZContentMenu: 2000;
$kuiZNavigation: 4000;
$kuiZMask: 6000;
$kuiZModal: 8000;
$kuiZContent: $kuiZLevel0;
$kuiZContentMenu: $kuiZLevel2;
$kuiZNavigation: $kuiZLevel4;
$kuiZMask: $kuiZLevel6;
$kuiZModal: $kuiZLevel8;
49 changes: 49 additions & 0 deletions ui_framework/dist/ui_framework.css
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; }