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.

Sign up for GitHub

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

feat(Paragraph): Add variant prop with long and short #1636

Merged
merged 14 commits into from
Mar 18, 2024
Merged

feat(Paragraph): Add variant prop with long and short #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f5ffebb
feat(Paragraph): Add `long` type
Barsnes Mar 4, 2024
ce7b324
feat: added long paragraph tokens
Febakke Mar 8, 2024
256edfb
🍱 Generated new package tokens
github-actions[bot] Mar 8, 2024
175f6d0
Merge branch 'main' into paragraph/long
mimarz Mar 11, 2024
f8611ed
update to use tokens
Barsnes Mar 11, 2024
a3de40d
place correctly
Barsnes Mar 11, 2024
e440baa
Merge branch 'main' into paragraph/long
mimarz Mar 12, 2024
e4e39fd
Revert "🍱 Generated new package tokens"
mimarz Mar 14, 2024
24d5e54
Merge branch 'main' into paragraph/long
mimarz Mar 14, 2024
a8945f4
🍱 Generated new package tokens
github-actions[bot] Mar 14, 2024
46cd592
change to use `variant`
Barsnes Mar 15, 2024
3f1585b
Merge branch 'main' into paragraph/long
Barsnes Mar 15, 2024
d79e36c
Update packages/react/src/components/Typography/Paragraph/Paragraph.tsx
Barsnes Mar 15, 2024
2100f70
Merge branch 'main' into paragraph/long
Barsnes Mar 18, 2024
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
72 changes: 72 additions & 0 deletions apps/storefront/tokens/altinn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,6 +2705,78 @@ export const typography = [
attributes: {},
path: ['typography', 'paragraph', 'short', 'xsmall'],
},
{
value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-large',
attributes: {},
path: ['typography', 'paragraph', 'long', 'large'],
},
{
value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f0}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-medium',
attributes: {},
path: ['typography', 'paragraph', 'long', 'medium'],
},
{
value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-small',
attributes: {},
path: ['typography', 'paragraph', 'long', 'small'],
},
{
value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-2}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-xsmall',
attributes: {},
path: ['typography', 'paragraph', 'long', 'xsmall'],
},
{
value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'",
type: 'typography',
Expand Down
72 changes: 72 additions & 0 deletions apps/storefront/tokens/brreg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2723,6 +2723,78 @@ export const typography = [
attributes: {},
path: ['typography', 'paragraph', 'short', 'xsmall'],
},
{
value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-large',
attributes: {},
path: ['typography', 'paragraph', 'long', 'large'],
},
{
value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f0}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-medium',
attributes: {},
path: ['typography', 'paragraph', 'long', 'medium'],
},
{
value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-small',
attributes: {},
path: ['typography', 'paragraph', 'long', 'small'],
},
{
value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-2}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-xsmall',
attributes: {},
path: ['typography', 'paragraph', 'long', 'xsmall'],
},
{
value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'",
type: 'typography',
Expand Down
72 changes: 72 additions & 0 deletions apps/storefront/tokens/digdir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,6 +2699,78 @@ export const typography = [
attributes: {},
path: ['typography', 'paragraph', 'short', 'xsmall'],
},
{
value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-large',
attributes: {},
path: ['typography', 'paragraph', 'long', 'large'],
},
{
value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f0}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-medium',
attributes: {},
path: ['typography', 'paragraph', 'long', 'medium'],
},
{
value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-small',
attributes: {},
path: ['typography', 'paragraph', 'long', 'small'],
},
{
value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-2}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-xsmall',
attributes: {},
path: ['typography', 'paragraph', 'long', 'xsmall'],
},
{
value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'",
type: 'typography',
Expand Down
72 changes: 72 additions & 0 deletions apps/storefront/tokens/tilsynet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2645,6 +2645,78 @@ export const typography = [
attributes: {},
path: ['typography', 'paragraph', 'short', 'xsmall'],
},
{
value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-large',
attributes: {},
path: ['typography', 'paragraph', 'long', 'large'],
},
{
value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f0}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-medium',
attributes: {},
path: ['typography', 'paragraph', 'long', 'medium'],
},
{
value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-1}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-small',
attributes: {},
path: ['typography', 'paragraph', 'long', 'small'],
},
{
value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'",
type: 'typography',
filePath: '../../design-tokens/Base/Semantic.json',
isSource: false,
original: {
value: {
fontFamily: '{fontFamilies.inter}',
fontWeight: '{fontWeights.regular}',
lineHeight: '{lineHeights.700}',
fontSize: '{font-size.f-2}',
},
type: 'typography',
},
name: '--fds-typography-paragraph-long-xsmall',
attributes: {},
path: ['typography', 'paragraph', 'long', 'xsmall'],
},
{
value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'",
type: 'typography',
Expand Down
38 changes: 38 additions & 0 deletions design-tokens/Base/Semantic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,44 @@
},
"type": "typography"
}
},
"long": {
"large": {
"value": {
"fontFamily": "{fontFamilies.inter}",
"fontWeight": "{fontWeights.regular}",
"lineHeight": "{lineHeights.700}",
"fontSize": "{font-size.f1}"
},
"type": "typography"
},
"medium": {
"value": {
"fontFamily": "{fontFamilies.inter}",
"fontWeight": "{fontWeights.regular}",
"lineHeight": "{lineHeights.700}",
"fontSize": "{font-size.f0}"
},
"type": "typography"
},
"small": {
"value": {
"fontFamily": "{fontFamilies.inter}",
"fontWeight": "{fontWeights.regular}",
"lineHeight": "{lineHeights.700}",
"fontSize": "{font-size.f-1}"
},
"type": "typography"
},
"xsmall": {
"value": {
"fontFamily": "{fontFamilies.inter}",
"fontWeight": "{fontWeights.regular}",
"lineHeight": "{lineHeights.700}",
"fontSize": "{font-size.f-2}"
},
"type": "typography"
}
}
},
"label": {
Expand Down
Loading
Loading