wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-26 13:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into next-ui-select

Browse Source
This commit is contained in:
Kiwi
2018-10-19 20:42:56 +02:00
committed by GitHub
parent f5324f65bb b5e98d1025
commit cd2ccf8792
26 changed files with 331 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/client/ui/components/Typography/Typography.css
+4
View File
@@ -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";
}
src/core/client/ui/components/Typography/Typography.tsx
+2
View File
@@ -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",