fix: Set font and min height on input fields (#112)

digdir · Feb 2, 2023 · e7671fa · e7671fa
1 parent f6077a6
commit e7671fa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "lerna:publish": "lerna publish from-git"
   },
   "devDependencies": {
-    "@altinn/figma-design-tokens": "^6.0.0",
+    "@altinn/figma-design-tokens": "^6.0.1",
     "@babel/core": "^7.19.1",
     "@babel/preset-env": "^7.19.1",
     "@babel/preset-typescript": "^7.18.6",

diff --git a/packages/react/src/components/Select/Select.module.css b/packages/react/src/components/Select/Select.module.css
@@ -32,7 +32,7 @@
   --field-height-inside: calc(
     var(--field-height) - var(--component-input-border_width-default) * 2
   );
-  --field-height: 36px;
+  --field-height: var(--component-input-size-min_height-default);
   --font_size: 16px;
   --interactive_element-cursor: pointer;
   --line-height: 1.5;

diff --git a/packages/react/src/components/_InputWrapper/InputWrapper.module.css b/packages/react/src/components/_InputWrapper/InputWrapper.module.css
@@ -13,6 +13,7 @@
   border-width: var(--component-input-border_width-default);
   box-sizing: border-box;
   display: flex;
+  min-height: var(--component-input-size-min_height-default);
 }
 
 .inputWrapper.withFocusEffect:focus-within {
@@ -69,6 +70,7 @@
   background: var(--background);
   border: none;
   box-sizing: border-box;
+  font-family: var(--font_family-default);
   outline: none;
   padding: var(--paddingY) var(--paddingX);
   width: 100%;

diff --git a/yarn.lock b/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd"
   integrity sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==
 
-"@altinn/figma-design-tokens@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@altinn/figma-design-tokens/-/figma-design-tokens-6.0.0.tgz#509268932f73ef948cd92a8d2e74304fc4694efc"
-  integrity sha512-zGk08S3DlXvBPiOfKg8nnTVolO7Bmak2RuUkMHzWC4LsksERDOWt6z87FNPPQP58Fp/pROZ7KOeZTdnlciUDvA==
+"@altinn/figma-design-tokens@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@altinn/figma-design-tokens/-/figma-design-tokens-6.0.1.tgz#5b7b9ac18e0bd071cdbd73b97a9a0c791d0aa0a3"
+  integrity sha512-8MbIZDZdDzeYwvQ1DaRUoVd6VkWjax/mlbq1haABwv0WX8++L426O9g2wg9YtZ+WeIa3JUSOhbiXMgpTVcXBDQ==
 
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"