Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #5 from teamleadercrm/update/heading-and-text
Browse files Browse the repository at this point in the history
Font-size, line-height and naming adjustments
  • Loading branch information
driesd authored Jan 22, 2018
2 parents 835e7fd + 95a4677 commit 1044706
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions index.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

.text {
strong {
font-family: var(--font-family-medium);
font-weight: 500;
font-family: var(--font-family-bold);
font-weight: 700;
}
}

Expand All @@ -51,16 +51,16 @@

.heading-2 {
font-family: var(--font-family-medium);
font-size: calc(2.0 * var(--unit));
font-size: calc(1.8 * var(--unit));
font-weight: 500;
line-height: calc(2.4 * var(--unit));
}

.heading-3 {
font-family: var(--font-family-medium);
font-size: calc(1.8 * var(--unit));
font-size: calc(1.6 * var(--unit));
font-weight: 500;
line-height: calc(2.4 * var(--unit));
line-height: calc(2.1 * var(--unit));
}

.heading-4 {
Expand All @@ -80,19 +80,19 @@
text-decoration: underline;
}

.text-body {
.text-display {
font-family: var(--font-family-regular);
font-size: calc(1.6 * var(--unit));
line-height: calc(2.4 * var(--unit));
}

.text-small {
.text-body {
font-family: var(--font-family-regular);
font-size: calc(1.4 * var(--unit));
line-height: calc(1.8 * var(--unit));
line-height: calc(2.1 * var(--unit));
}

.text-tiny {
.text-small {
font-family: var(--font-family-regular);
font-size: calc(1.2 * var(--unit));
line-height: calc(1.8 * var(--unit));
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ <h2 class="heading heading-2">I'm a Heading H2</h2>
<h3 class="heading heading-3">I'm a Heading H3</h3>
<h4 class="heading heading-4">I'm a Heading H4</h4>

<p class="text text-body">I'm body copy</p>
<p class="text text-small">I'm small body copy</p>
<p class="text text-tiny">I'm tiny body copy</p>
<p class="text text-display">I'm display text</p>
<p class="text text-body">I'm body text</p>
<p class="text text-small">I'm small text</p>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@teamleader/ui-typography",
"private": false,
"version": "0.0.10",
"version": "0.1.0",
"description": "Teamleader UI typography",
"main": "index.css",
"repository": {
Expand Down

0 comments on commit 1044706

Please sign in to comment.