Merge branch 'next' into next-ui-select

This commit is contained in:
Kiwi
2018-10-19 20:42:56 +02:00
committed by GitHub
26 changed files with 331 additions and 101 deletions
@@ -19,6 +19,10 @@
composes: heading4 from "talk-ui/shared/typography.css";
}
.heading5 {
composes: heading5 from "talk-ui/shared/typography.css";
}
.bodyCopy {
composes: bodyCopy from "talk-ui/shared/typography.css";
}
@@ -12,6 +12,7 @@ type Variant =
| "heading2"
| "heading3"
| "heading4"
| "heading5"
| "bodyCopy"
| "bodyCopyBold"
| "inputLabel"
@@ -142,6 +143,7 @@ Typography.defaultProps = {
heading2: "h1",
heading3: "h1",
heading4: "h1",
heading5: "h1",
bodyCopy: "p",
bodyCopyBold: "p",
timestamp: "span",
+8
View File
@@ -91,6 +91,14 @@
letter-spacing: calc(0.2em / 16);
color: var(--palette-text-primary);
}
.heading5 {
font-size: calc(14rem / var(--rem-base));
font-weight: var(--font-weight-medium);
font-family: var(--font-family-serif);
line-height: calc(16em / 16);
letter-spacing: calc(0.2em / 16);
color: var(--palette-text-primary);
}
.bodyCopy {
font-size: calc(16rem / var(--rem-base));