Unverified Commit a58a7917 authored by Marcos Iglesias's avatar Marcos Iglesias Committed by GitHub

feat: Adds caption and monospace font definitions (#644)

* Adds .text-monospace-w3 and removes monospace from resource type styles
Signed-off-by: 's avatarMarcos Iglesias <miglesiasvalle@lyft.com>

* Adding caption and monospace fonts
Signed-off-by: 's avatarMarcos Iglesias <miglesiasvalle@lyft.com>

* Updating resource type font
Signed-off-by: 's avatarMarcos Iglesias <miglesiasvalle@lyft.com>
parent 273d5dd4
...@@ -98,6 +98,27 @@ ...@@ -98,6 +98,27 @@
font-weight: $body-font-weight; font-weight: $body-font-weight;
} }
%text-monospace-w3 {
font-family: $font-family-monospace-code;
font-size: $w3-font-size;
line-height: $w3-line-height;
font-weight: $body-font-weight;
}
%text-caption-w1 {
font-size: $w1-caption-font-size;
line-height: $w1-caption-line-height;
font-weight: $caption-font-weight;
text-transform: uppercase;
}
%text-caption-w2 {
font-size: $w2-caption-font-size;
line-height: $w2-caption-line-height;
font-weight: $caption-font-weight;
text-transform: uppercase;
}
// Typography classes // Typography classes
// Headlines // Headlines
.text-headline-w1 { .text-headline-w1 {
...@@ -151,6 +172,20 @@ ...@@ -151,6 +172,20 @@
@extend %text-body-w3; @extend %text-body-w3;
} }
// Captions
.text-caption-w1 {
@extend %text-caption-w1;
}
.text-caption-w2 {
@extend %text-caption-w2;
}
// Monospace
.text-monospace-w3 {
@extend %text-monospace-w3;
}
// Typography Helpers // Typography Helpers
.text-center { .text-center {
text-align: center; text-align: center;
...@@ -339,9 +374,9 @@ body { ...@@ -339,9 +374,9 @@ body {
} }
.resource-type { .resource-type {
@extend %text-subtitle-w3;
color: $text-placeholder; color: $text-placeholder;
font-family: $font-family-monospace;
font-size: 13px;
} }
.helper-text { .helper-text {
......
...@@ -163,8 +163,15 @@ $w2-headline-line-height: 32px; ...@@ -163,8 +163,15 @@ $w2-headline-line-height: 32px;
$w3-headline-font-size: 22px; $w3-headline-font-size: 22px;
$w3-headline-line-height: 28px; $w3-headline-line-height: 28px;
$w1-caption-font-size: $w2-font-size;
$w1-caption-line-height: $w2-line-height;
$w2-caption-font-size: 12px;
$w2-caption-line-height: 16px;
$code-font-size: 12px; $code-font-size: 12px;
$title-font-weight: $font-weight-body-bold; $title-font-weight: $font-weight-body-bold;
$subtitle-font-weight: $font-weight-body-semi-bold; $subtitle-font-weight: $font-weight-body-semi-bold;
$body-font-weight: $font-weight-body-regular; $body-font-weight: $font-weight-body-regular;
$caption-font-weight: $font-weight-body-bold;
// Copyright Contributors to the Amundsen project. // Copyright Contributors to the Amundsen project.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
import React, { ReactNode } from 'react'; import * as React from 'react';
import StorySection from '../components/common/StorySection'; import StorySection from '../components/common/StorySection';
...@@ -40,6 +40,17 @@ export const TypographyUpdated = () => { ...@@ -40,6 +40,17 @@ export const TypographyUpdated = () => {
<p className="text-body-w3">Subtitle with .text-body-w3</p> <p className="text-body-w3">Subtitle with .text-body-w3</p>
</> </>
</StorySection> </StorySection>
<StorySection title="Caption Text">
<>
<p className="text-caption-w1">Caption with .text-caption-w1</p>
<p className="text-caption-w2">Caption with .text-caption-w2</p>
</>
</StorySection>
<StorySection title="Code Text">
<>
<p className="text-monospace-w3">Code with .text-monospace-w3</p>
</>
</StorySection>
</> </>
); );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment