Skip to content

Commit

Permalink
feat(Paragraph): Add variant prop with long and short (#1636)
Browse files Browse the repository at this point in the history 
Co-authored-by: Lasse Febakke Straum <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Michael Marszalek <[email protected]>
  • Loading branch information
@Barsnes @Febakke
@github-actions @mimarz
4 people authored Mar 18, 2024
1 parent ece7c9e commit efedb27
Show file tree
Hide file tree
Showing 12 changed files with 375 additions and 2 deletions.
72 changes: 72 additions & 0 deletions apps/storefront/tokens/altinn.ts
View file
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
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
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
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
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

0 comments on commit efedb27

Please sign in to comment.