Skip to content

Commit

Permalink
fix missing line-height
Browse files Browse the repository at this point in the history
  • Loading branch information
@mimarz
mimarz committed Sep 17, 2024
1 parent a1ff185 commit 16e1669
Show file tree
Hide file tree
Showing 14 changed files with 498 additions and 11 deletions.
12 changes: 2 additions & 10 deletions packages/cli/src/tokens/build/configs.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { register } from '@tokens-studio/sd-transforms';
import { expandTypesMap, register } from '@tokens-studio/sd-transforms';
import type { ThemeObject } from '@tokens-studio/types';
import * as R from 'ramda';
import StyleDictionary from 'style-dictionary';
Expand Down Expand Up @@ -212,15 +212,7 @@ export const typographyVariables: GetConfig = ({ outPath, theme, typography }) =
preprocessors: ['tokens-studio'],
expand: {
include: ['typography'],
// // more info about typesMap later...
// typesMap: {
// // all width props are mapped to 'dimension' type
// width: 'dimension',
// typography: {
// // fontSize prop is mapped to 'dimension' type if inside a typography composite type token
// fontSize: 'dimension',
// },
// },
typesMap: { ...expandTypesMap, typography: { ...expandTypesMap.typography, letterSpacing: 'dimension' } },
},
platforms: {
css: {
Expand Down
1 change: 0 additions & 1 deletion packages/cli/src/tokens/build/transformers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export const typographyName: Transform = {
transitive: true,
filter: (token) => typeEquals('typography', token),
transform: (token) => {
console.log(token);
return token.name.replace('-typography', '');
},
};
62 changes: 62 additions & 0 deletions packages/theme/brand/altinn.css
View file

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions packages/theme/brand/altinn/typography/primary.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,126 +10,157 @@
--ds-font-weight-regular: 400;
--ds-typography-heading-2xl-font-family: Helvetica Neue;
--ds-typography-heading-2xl-font-weight: 500;
--ds-typography-heading-2xl-line-height: 1.3;
--ds-typography-heading-2xl-font-size: 3.75rem;
--ds-typography-heading-2xl-letter-spacing: -1%;
--ds-typography-heading-xl-font-family: Helvetica Neue;
--ds-typography-heading-xl-font-weight: 500;
--ds-typography-heading-xl-line-height: 1.3;
--ds-typography-heading-xl-font-size: 3rem;
--ds-typography-heading-xl-letter-spacing: -1%;
--ds-typography-heading-lg-font-family: Helvetica Neue;
--ds-typography-heading-lg-font-weight: 500;
--ds-typography-heading-lg-line-height: 1.3;
--ds-typography-heading-lg-font-size: 2.25rem;
--ds-typography-heading-lg-letter-spacing: -0.5%;
--ds-typography-heading-md-font-family: Helvetica Neue;
--ds-typography-heading-md-font-weight: 500;
--ds-typography-heading-md-line-height: 1.3;
--ds-typography-heading-md-font-size: 1.875rem;
--ds-typography-heading-md-letter-spacing: -0.25%;
--ds-typography-heading-sm-font-family: Helvetica Neue;
--ds-typography-heading-sm-font-weight: 500;
--ds-typography-heading-sm-line-height: 1.3;
--ds-typography-heading-sm-font-size: 1.5rem;
--ds-typography-heading-sm-letter-spacing: 0%;
--ds-typography-heading-xs-font-family: Helvetica Neue;
--ds-typography-heading-xs-font-weight: 500;
--ds-typography-heading-xs-line-height: 1.3;
--ds-typography-heading-xs-font-size: 1.3125rem;
--ds-typography-heading-xs-letter-spacing: 0.15%;
--ds-typography-heading-2xs-font-family: Helvetica Neue;
--ds-typography-heading-2xs-font-weight: 500;
--ds-typography-heading-2xs-line-height: 1.3;
--ds-typography-heading-2xs-font-size: 1.125rem;
--ds-typography-heading-2xs-letter-spacing: 0.15%;
--ds-typography-ingress-lg-font-family: Helvetica Neue;
--ds-typography-ingress-lg-font-weight: 400;
--ds-typography-ingress-lg-line-height: 1.7;
--ds-typography-ingress-lg-font-size: 1.875rem;
--ds-typography-ingress-lg-letter-spacing: 0.5%;
--ds-typography-ingress-md-font-family: Helvetica Neue;
--ds-typography-ingress-md-font-weight: 400;
--ds-typography-ingress-md-line-height: 1.7;
--ds-typography-ingress-md-font-size: 1.5rem;
--ds-typography-ingress-md-letter-spacing: 0.5%;
--ds-typography-ingress-sm-font-family: Helvetica Neue;
--ds-typography-ingress-sm-font-weight: 400;
--ds-typography-ingress-sm-line-height: 1.7;
--ds-typography-ingress-sm-font-size: 1.3125rem;
--ds-typography-ingress-sm-letter-spacing: 0.25%;
--ds-typography-ingress-xs-font-family: Helvetica Neue;
--ds-typography-ingress-xs-font-weight: 400;
--ds-typography-ingress-xs-line-height: 1.7;
--ds-typography-ingress-xs-font-size: 1.125rem;
--ds-typography-ingress-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-lg-font-family: Helvetica Neue;
--ds-typography-paragraph-lg-font-weight: 400;
--ds-typography-paragraph-lg-line-height: 1.5;
--ds-typography-paragraph-lg-font-size: 1.3125rem;
--ds-typography-paragraph-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-md-font-family: Helvetica Neue;
--ds-typography-paragraph-md-font-weight: 400;
--ds-typography-paragraph-md-line-height: 1.5;
--ds-typography-paragraph-md-font-size: 1.125rem;
--ds-typography-paragraph-md-letter-spacing: 0.5%;
--ds-typography-paragraph-sm-font-family: Helvetica Neue;
--ds-typography-paragraph-sm-font-weight: 400;
--ds-typography-paragraph-sm-line-height: 1.5;
--ds-typography-paragraph-sm-font-size: 1rem;
--ds-typography-paragraph-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-xs-font-family: Helvetica Neue;
--ds-typography-paragraph-xs-font-weight: 400;
--ds-typography-paragraph-xs-line-height: 1.5;
--ds-typography-paragraph-xs-font-size: 0.875rem;
--ds-typography-paragraph-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-short-lg-font-family: Helvetica Neue;
--ds-typography-paragraph-short-lg-font-weight: 400;
--ds-typography-paragraph-short-lg-line-height: 1.3;
--ds-typography-paragraph-short-lg-font-size: 1.3125rem;
--ds-typography-paragraph-short-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-short-md-font-family: Helvetica Neue;
--ds-typography-paragraph-short-md-font-weight: 400;
--ds-typography-paragraph-short-md-line-height: 1.3;
--ds-typography-paragraph-short-md-font-size: 1.125rem;
--ds-typography-paragraph-short-md-letter-spacing: 0.5%;
--ds-typography-paragraph-short-sm-font-family: Helvetica Neue;
--ds-typography-paragraph-short-sm-font-weight: 400;
--ds-typography-paragraph-short-sm-line-height: 1.3;
--ds-typography-paragraph-short-sm-font-size: 1rem;
--ds-typography-paragraph-short-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-short-xs-font-family: Helvetica Neue;
--ds-typography-paragraph-short-xs-font-weight: 400;
--ds-typography-paragraph-short-xs-line-height: 1.3;
--ds-typography-paragraph-short-xs-font-size: 0.875rem;
--ds-typography-paragraph-short-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-long-lg-font-family: Helvetica Neue;
--ds-typography-paragraph-long-lg-font-weight: 400;
--ds-typography-paragraph-long-lg-line-height: 1.7;
--ds-typography-paragraph-long-lg-font-size: 1.3125rem;
--ds-typography-paragraph-long-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-long-md-font-family: Helvetica Neue;
--ds-typography-paragraph-long-md-font-weight: 400;
--ds-typography-paragraph-long-md-line-height: 1.7;
--ds-typography-paragraph-long-md-font-size: 1.125rem;
--ds-typography-paragraph-long-md-letter-spacing: 0.5%;
--ds-typography-paragraph-long-sm-font-family: Helvetica Neue;
--ds-typography-paragraph-long-sm-font-weight: 400;
--ds-typography-paragraph-long-sm-line-height: 1.7;
--ds-typography-paragraph-long-sm-font-size: 1rem;
--ds-typography-paragraph-long-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-long-xs-font-family: Helvetica Neue;
--ds-typography-paragraph-long-xs-font-weight: 400;
--ds-typography-paragraph-long-xs-line-height: 1.7;
--ds-typography-paragraph-long-xs-font-size: 0.875rem;
--ds-typography-paragraph-long-xs-letter-spacing: 0.15%;
--ds-typography-label-lg-font-family: Helvetica Neue;
--ds-typography-label-lg-font-weight: 500;
--ds-typography-label-lg-line-height: 1.3;
--ds-typography-label-lg-font-size: 1.3125rem;
--ds-typography-label-lg-letter-spacing: 0.5%;
--ds-typography-label-md-font-family: Helvetica Neue;
--ds-typography-label-md-font-weight: 500;
--ds-typography-label-md-line-height: 1.3;
--ds-typography-label-md-font-size: 1.125rem;
--ds-typography-label-md-letter-spacing: 0.5%;
--ds-typography-label-sm-font-family: Helvetica Neue;
--ds-typography-label-sm-font-weight: 500;
--ds-typography-label-sm-line-height: 1.3;
--ds-typography-label-sm-font-size: 1rem;
--ds-typography-label-sm-letter-spacing: 0.25%;
--ds-typography-label-xs-font-family: Helvetica Neue;
--ds-typography-label-xs-font-weight: 500;
--ds-typography-label-xs-line-height: 1.3;
--ds-typography-label-xs-font-size: 0.875rem;
--ds-typography-label-xs-letter-spacing: 0.15%;
--ds-typography-error_message-lg-font-family: Helvetica Neue;
--ds-typography-error_message-lg-font-weight: 400;
--ds-typography-error_message-lg-line-height: 1.3;
--ds-typography-error_message-lg-font-size: 1.3125rem;
--ds-typography-error_message-lg-letter-spacing: 0.5%;
--ds-typography-error_message-md-font-family: Helvetica Neue;
--ds-typography-error_message-md-font-weight: 400;
--ds-typography-error_message-md-line-height: 1.3;
--ds-typography-error_message-md-font-size: 1.125rem;
--ds-typography-error_message-md-letter-spacing: 0.5%;
--ds-typography-error_message-sm-font-family: Helvetica Neue;
--ds-typography-error_message-sm-font-weight: 400;
--ds-typography-error_message-sm-line-height: 1.3;
--ds-typography-error_message-sm-font-size: 1rem;
--ds-typography-error_message-sm-letter-spacing: 0.25%;
--ds-typography-error_message-xs-font-family: Helvetica Neue;
--ds-typography-error_message-xs-font-weight: 400;
--ds-typography-error_message-xs-line-height: 1.3;
--ds-typography-error_message-xs-font-size: 0.875rem;
--ds-typography-error_message-xs-letter-spacing: 0.15%;
--ds-line-height-sm: 1.3;
Expand Down
31 changes: 31 additions & 0 deletions packages/theme/brand/altinn/typography/secondary.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,126 +10,157 @@
--ds-font-weight-regular: 400;
--ds-typography-heading-2xl-font-family: IBM Plex Mono;
--ds-typography-heading-2xl-font-weight: 400;
--ds-typography-heading-2xl-line-height: 1.3;
--ds-typography-heading-2xl-font-size: 3.75rem;
--ds-typography-heading-2xl-letter-spacing: -1%;
--ds-typography-heading-xl-font-family: IBM Plex Mono;
--ds-typography-heading-xl-font-weight: 400;
--ds-typography-heading-xl-line-height: 1.3;
--ds-typography-heading-xl-font-size: 3rem;
--ds-typography-heading-xl-letter-spacing: -1%;
--ds-typography-heading-lg-font-family: IBM Plex Mono;
--ds-typography-heading-lg-font-weight: 400;
--ds-typography-heading-lg-line-height: 1.3;
--ds-typography-heading-lg-font-size: 2.25rem;
--ds-typography-heading-lg-letter-spacing: -0.5%;
--ds-typography-heading-md-font-family: IBM Plex Mono;
--ds-typography-heading-md-font-weight: 400;
--ds-typography-heading-md-line-height: 1.3;
--ds-typography-heading-md-font-size: 1.875rem;
--ds-typography-heading-md-letter-spacing: -0.25%;
--ds-typography-heading-sm-font-family: IBM Plex Mono;
--ds-typography-heading-sm-font-weight: 400;
--ds-typography-heading-sm-line-height: 1.3;
--ds-typography-heading-sm-font-size: 1.5rem;
--ds-typography-heading-sm-letter-spacing: 0%;
--ds-typography-heading-xs-font-family: IBM Plex Mono;
--ds-typography-heading-xs-font-weight: 400;
--ds-typography-heading-xs-line-height: 1.3;
--ds-typography-heading-xs-font-size: 1.3125rem;
--ds-typography-heading-xs-letter-spacing: 0.15%;
--ds-typography-heading-2xs-font-family: IBM Plex Mono;
--ds-typography-heading-2xs-font-weight: 400;
--ds-typography-heading-2xs-line-height: 1.3;
--ds-typography-heading-2xs-font-size: 1.125rem;
--ds-typography-heading-2xs-letter-spacing: 0.15%;
--ds-typography-ingress-lg-font-family: IBM Plex Mono;
--ds-typography-ingress-lg-font-weight: 400;
--ds-typography-ingress-lg-line-height: 1.7;
--ds-typography-ingress-lg-font-size: 1.875rem;
--ds-typography-ingress-lg-letter-spacing: 0.5%;
--ds-typography-ingress-md-font-family: IBM Plex Mono;
--ds-typography-ingress-md-font-weight: 400;
--ds-typography-ingress-md-line-height: 1.7;
--ds-typography-ingress-md-font-size: 1.5rem;
--ds-typography-ingress-md-letter-spacing: 0.5%;
--ds-typography-ingress-sm-font-family: IBM Plex Mono;
--ds-typography-ingress-sm-font-weight: 400;
--ds-typography-ingress-sm-line-height: 1.7;
--ds-typography-ingress-sm-font-size: 1.3125rem;
--ds-typography-ingress-sm-letter-spacing: 0.25%;
--ds-typography-ingress-xs-font-family: IBM Plex Mono;
--ds-typography-ingress-xs-font-weight: 400;
--ds-typography-ingress-xs-line-height: 1.7;
--ds-typography-ingress-xs-font-size: 1.125rem;
--ds-typography-ingress-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-lg-font-family: IBM Plex Mono;
--ds-typography-paragraph-lg-font-weight: 400;
--ds-typography-paragraph-lg-line-height: 1.5;
--ds-typography-paragraph-lg-font-size: 1.3125rem;
--ds-typography-paragraph-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-md-font-family: IBM Plex Mono;
--ds-typography-paragraph-md-font-weight: 400;
--ds-typography-paragraph-md-line-height: 1.5;
--ds-typography-paragraph-md-font-size: 1.125rem;
--ds-typography-paragraph-md-letter-spacing: 0.5%;
--ds-typography-paragraph-sm-font-family: IBM Plex Mono;
--ds-typography-paragraph-sm-font-weight: 400;
--ds-typography-paragraph-sm-line-height: 1.5;
--ds-typography-paragraph-sm-font-size: 1rem;
--ds-typography-paragraph-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-xs-font-family: IBM Plex Mono;
--ds-typography-paragraph-xs-font-weight: 400;
--ds-typography-paragraph-xs-line-height: 1.5;
--ds-typography-paragraph-xs-font-size: 0.875rem;
--ds-typography-paragraph-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-short-lg-font-family: IBM Plex Mono;
--ds-typography-paragraph-short-lg-font-weight: 400;
--ds-typography-paragraph-short-lg-line-height: 1.3;
--ds-typography-paragraph-short-lg-font-size: 1.3125rem;
--ds-typography-paragraph-short-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-short-md-font-family: IBM Plex Mono;
--ds-typography-paragraph-short-md-font-weight: 400;
--ds-typography-paragraph-short-md-line-height: 1.3;
--ds-typography-paragraph-short-md-font-size: 1.125rem;
--ds-typography-paragraph-short-md-letter-spacing: 0.5%;
--ds-typography-paragraph-short-sm-font-family: IBM Plex Mono;
--ds-typography-paragraph-short-sm-font-weight: 400;
--ds-typography-paragraph-short-sm-line-height: 1.3;
--ds-typography-paragraph-short-sm-font-size: 1rem;
--ds-typography-paragraph-short-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-short-xs-font-family: IBM Plex Mono;
--ds-typography-paragraph-short-xs-font-weight: 400;
--ds-typography-paragraph-short-xs-line-height: 1.3;
--ds-typography-paragraph-short-xs-font-size: 0.875rem;
--ds-typography-paragraph-short-xs-letter-spacing: 0.15%;
--ds-typography-paragraph-long-lg-font-family: IBM Plex Mono;
--ds-typography-paragraph-long-lg-font-weight: 400;
--ds-typography-paragraph-long-lg-line-height: 1.7;
--ds-typography-paragraph-long-lg-font-size: 1.3125rem;
--ds-typography-paragraph-long-lg-letter-spacing: 0.5%;
--ds-typography-paragraph-long-md-font-family: IBM Plex Mono;
--ds-typography-paragraph-long-md-font-weight: 400;
--ds-typography-paragraph-long-md-line-height: 1.7;
--ds-typography-paragraph-long-md-font-size: 1.125rem;
--ds-typography-paragraph-long-md-letter-spacing: 0.5%;
--ds-typography-paragraph-long-sm-font-family: IBM Plex Mono;
--ds-typography-paragraph-long-sm-font-weight: 400;
--ds-typography-paragraph-long-sm-line-height: 1.7;
--ds-typography-paragraph-long-sm-font-size: 1rem;
--ds-typography-paragraph-long-sm-letter-spacing: 0.25%;
--ds-typography-paragraph-long-xs-font-family: IBM Plex Mono;
--ds-typography-paragraph-long-xs-font-weight: 400;
--ds-typography-paragraph-long-xs-line-height: 1.7;
--ds-typography-paragraph-long-xs-font-size: 0.875rem;
--ds-typography-paragraph-long-xs-letter-spacing: 0.15%;
--ds-typography-label-lg-font-family: IBM Plex Mono;
--ds-typography-label-lg-font-weight: 400;
--ds-typography-label-lg-line-height: 1.3;
--ds-typography-label-lg-font-size: 1.3125rem;
--ds-typography-label-lg-letter-spacing: 0.5%;
--ds-typography-label-md-font-family: IBM Plex Mono;
--ds-typography-label-md-font-weight: 400;
--ds-typography-label-md-line-height: 1.3;
--ds-typography-label-md-font-size: 1.125rem;
--ds-typography-label-md-letter-spacing: 0.5%;
--ds-typography-label-sm-font-family: IBM Plex Mono;
--ds-typography-label-sm-font-weight: 400;
--ds-typography-label-sm-line-height: 1.3;
--ds-typography-label-sm-font-size: 1rem;
--ds-typography-label-sm-letter-spacing: 0.25%;
--ds-typography-label-xs-font-family: IBM Plex Mono;
--ds-typography-label-xs-font-weight: 400;
--ds-typography-label-xs-line-height: 1.3;
--ds-typography-label-xs-font-size: 0.875rem;
--ds-typography-label-xs-letter-spacing: 0.15%;
--ds-typography-error_message-lg-font-family: IBM Plex Mono;
--ds-typography-error_message-lg-font-weight: 400;
--ds-typography-error_message-lg-line-height: 1.3;
--ds-typography-error_message-lg-font-size: 1.3125rem;
--ds-typography-error_message-lg-letter-spacing: 0.5%;
--ds-typography-error_message-md-font-family: IBM Plex Mono;
--ds-typography-error_message-md-font-weight: 400;
--ds-typography-error_message-md-line-height: 1.3;
--ds-typography-error_message-md-font-size: 1.125rem;
--ds-typography-error_message-md-letter-spacing: 0.5%;
--ds-typography-error_message-sm-font-family: IBM Plex Mono;
--ds-typography-error_message-sm-font-weight: 400;
--ds-typography-error_message-sm-line-height: 1.3;
--ds-typography-error_message-sm-font-size: 1rem;
--ds-typography-error_message-sm-letter-spacing: 0.25%;
--ds-typography-error_message-xs-font-family: IBM Plex Mono;
--ds-typography-error_message-xs-font-weight: 400;
--ds-typography-error_message-xs-line-height: 1.3;
--ds-typography-error_message-xs-font-size: 0.875rem;
--ds-typography-error_message-xs-letter-spacing: 0.15%;
--ds-line-height-sm: 1.3;
Expand Down
Loading

0 comments on commit 16e1669

Please sign in to comment.