Merge branch 'main' into css/chip-p

digdir · Apr 10, 2024 · f9a2f6e · f9a2f6e
2 parents 21866ee + e870720
commit f9a2f6e
Show file tree

Hide file tree

Showing 19 changed files with 129 additions and 57 deletions.
diff --git a/apps/storefront/tokens/altinn.ts b/apps/storefront/tokens/altinn.ts
@@ -2526,15 +2526,15 @@ export const typography = [
     path: ['typography', 'heading', 'xxsmall'],
   },
   {
-    value: "400 1.875rem/1.6 'Inter'",
+    value: "400 1.875rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f4}',
       },
       type: 'typography',
@@ -2544,15 +2544,15 @@ export const typography = [
     path: ['typography', 'ingress', 'large'],
   },
   {
-    value: "400 1.5rem/1.6 'Inter'",
+    value: "400 1.5rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f3}',
       },
       type: 'typography',
@@ -2562,15 +2562,15 @@ export const typography = [
     path: ['typography', 'ingress', 'medium'],
   },
   {
-    value: "400 1.3125rem/1.6 'Inter'",
+    value: "400 1.3125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f2}',
       },
       type: 'typography',
@@ -2580,15 +2580,15 @@ export const typography = [
     path: ['typography', 'ingress', 'small'],
   },
   {
-    value: "400 1.125rem/1.6 'Inter'",
+    value: "400 1.125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f1}',
       },
       type: 'typography',

diff --git a/apps/storefront/tokens/brreg.ts b/apps/storefront/tokens/brreg.ts
@@ -2544,15 +2544,15 @@ export const typography = [
     path: ['typography', 'heading', 'xxsmall'],
   },
   {
-    value: "400 1.875rem/1.6 'Inter'",
+    value: "400 1.875rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f4}',
       },
       type: 'typography',
@@ -2562,15 +2562,15 @@ export const typography = [
     path: ['typography', 'ingress', 'large'],
   },
   {
-    value: "400 1.5rem/1.6 'Inter'",
+    value: "400 1.5rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f3}',
       },
       type: 'typography',
@@ -2580,15 +2580,15 @@ export const typography = [
     path: ['typography', 'ingress', 'medium'],
   },
   {
-    value: "400 1.3125rem/1.6 'Inter'",
+    value: "400 1.3125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f2}',
       },
       type: 'typography',
@@ -2598,15 +2598,15 @@ export const typography = [
     path: ['typography', 'ingress', 'small'],
   },
   {
-    value: "400 1.125rem/1.6 'Inter'",
+    value: "400 1.125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f1}',
       },
       type: 'typography',

diff --git a/apps/storefront/tokens/digdir.ts b/apps/storefront/tokens/digdir.ts
@@ -2520,15 +2520,15 @@ export const typography = [
     path: ['typography', 'heading', 'xxsmall'],
   },
   {
-    value: "400 1.875rem/1.6 'Inter'",
+    value: "400 1.875rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f4}',
       },
       type: 'typography',
@@ -2538,15 +2538,15 @@ export const typography = [
     path: ['typography', 'ingress', 'large'],
   },
   {
-    value: "400 1.5rem/1.6 'Inter'",
+    value: "400 1.5rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f3}',
       },
       type: 'typography',
@@ -2556,15 +2556,15 @@ export const typography = [
     path: ['typography', 'ingress', 'medium'],
   },
   {
-    value: "400 1.3125rem/1.6 'Inter'",
+    value: "400 1.3125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f2}',
       },
       type: 'typography',
@@ -2574,15 +2574,15 @@ export const typography = [
     path: ['typography', 'ingress', 'small'],
   },
   {
-    value: "400 1.125rem/1.6 'Inter'",
+    value: "400 1.125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f1}',
       },
       type: 'typography',

diff --git a/apps/storefront/tokens/tilsynet.ts b/apps/storefront/tokens/tilsynet.ts
@@ -2466,15 +2466,15 @@ export const typography = [
     path: ['typography', 'heading', 'xxsmall'],
   },
   {
-    value: "400 1.875rem/1.6 'Inter'",
+    value: "400 1.875rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f4}',
       },
       type: 'typography',
@@ -2484,15 +2484,15 @@ export const typography = [
     path: ['typography', 'ingress', 'large'],
   },
   {
-    value: "400 1.5rem/1.6 'Inter'",
+    value: "400 1.5rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f3}',
       },
       type: 'typography',
@@ -2502,15 +2502,15 @@ export const typography = [
     path: ['typography', 'ingress', 'medium'],
   },
   {
-    value: "400 1.3125rem/1.6 'Inter'",
+    value: "400 1.3125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f2}',
       },
       type: 'typography',
@@ -2520,15 +2520,15 @@ export const typography = [
     path: ['typography', 'ingress', 'small'],
   },
   {
-    value: "400 1.125rem/1.6 'Inter'",
+    value: "400 1.125rem/1.7 'Inter'",
     type: 'typography',
     filePath: '../../design-tokens/Base/Semantic.json',
     isSource: false,
     original: {
       value: {
         fontFamily: '{fontFamilies.inter}',
         fontWeight: '{fontWeights.regular}',
-        lineHeight: '{lineHeights.600}',
+        lineHeight: '{lineHeights.700}',
         fontSize: '{font-size.f1}',
       },
       type: 'typography',

diff --git a/design-tokens/Base/Semantic.json b/design-tokens/Base/Semantic.json
@@ -519,7 +519,7 @@
         "value": {
           "fontFamily": "{fontFamilies.inter}",
           "fontWeight": "{fontWeights.regular}",
-          "lineHeight": "{lineHeights.600}",
+          "lineHeight": "{lineHeights.700}",
           "fontSize": "{font-size.f4}"
         },
         "type": "typography"
@@ -528,7 +528,7 @@
         "value": {
           "fontFamily": "{fontFamilies.inter}",
           "fontWeight": "{fontWeights.regular}",
-          "lineHeight": "{lineHeights.600}",
+          "lineHeight": "{lineHeights.700}",
           "fontSize": "{font-size.f3}"
         },
         "type": "typography"
@@ -537,7 +537,7 @@
         "value": {
           "fontFamily": "{fontFamilies.inter}",
           "fontWeight": "{fontWeights.regular}",
-          "lineHeight": "{lineHeights.600}",
+          "lineHeight": "{lineHeights.700}",
           "fontSize": "{font-size.f2}"
         },
         "type": "typography"
@@ -546,7 +546,7 @@
         "value": {
           "fontFamily": "{fontFamilies.inter}",
           "fontWeight": "{fontWeights.regular}",
-          "lineHeight": "{lineHeights.600}",
+          "lineHeight": "{lineHeights.700}",
           "fontSize": "{font-size.f1}"
         },
         "type": "typography"
@@ -1026,4 +1026,4 @@
       "type": "boxShadow"
     }
   }
-}
+}
diff --git a/packages/css/CHANGELOG.md b/packages/css/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.3-alpha.0](https://github.com/digdir/designsystemet/compare/@digdir/[email protected]...@digdir/[email protected]) (2024-04-09)
+
+### Features
+
+- 🎨 Use new sizing scale for typography and components ([#1696](https://github.com/digdir/designsystemet/issues/1696)) ([61b1af7](https://github.com/digdir/designsystemet/commit/61b1af79d96049b664c3fd5725fdffe0f34b27cb))
+
 ## [0.3.2](https://github.com/digdir/designsystemet/compare/@digdir/[email protected]...@digdir/[email protected]) (2024-04-08)
 
 ### Bug Fixes

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digdir/designsystemet-css",
-  "version": "0.3.2",
+  "version": "0.3.3-alpha.0",
   "description": "CSS for Designsystemet",
   "author": "Designsystemet team",
   "repository": "https://github.com/digdir/designsystemet",
@@ -13,6 +13,14 @@
   "publishConfig": {
     "access": "public"
   },
+  "browserslist": [
+    "cover 90% in NO",
+    "last 2 versions",
+    "Firefox ESR",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ],
   "keywords": [
     "css",
     "designsystem",
@@ -24,6 +32,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
+    "autoprefixer": "^10.4.19",
     "cssnano": "^6.0.2",
     "postcss": "^8.4.35",
     "postcss-cli": "^11.0.0",

diff --git a/packages/css/postcss.config.js b/packages/css/postcss.config.js
@@ -5,5 +5,6 @@ module.exports = {
       preset: 'default',
     }),
     require('./postcss-layers'),
+    require('autoprefixer'),
   ],
 };
diff --git a/packages/react-old/CHANGELOG.md b/packages/react-old/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.53.7-alpha.0](https://github.com/digdir/designsystemet/compare/@digdir/[email protected]...@digdir/[email protected]) (2024-04-09)
+
+**Note:** Version bump only for package @digdir/design-system-react
+
 ## [0.53.6](https://github.com/digdir/designsystemet/compare/@digdir/[email protected]...@digdir/[email protected]) (2024-04-08)
 
 **Note:** Version bump only for package @digdir/design-system-react