@entur/typography 2.0.4 → 2.1.0

package/dist/styles.css

@@ -1,184 +1,3 @@
-/*! modern-normalize v3.0.1 | MIT License | https://github.com/sindresorhus/modern-normalize */
-/*
-Document
-========
-*/
-/**
-Use a better box model (opinionated).
-*/
-*,
-::before,
-::after{
-  -webkit-box-sizing:border-box;
-     -moz-box-sizing:border-box;
-          box-sizing:border-box;
-}
-
-html{
-  /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
-  font-family:system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-  line-height:1.15; /* 1. Correct the line height in all browsers. */
-  -webkit-text-size-adjust:100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
-  -moz-tab-size:4;
-    -o-tab-size:4;
-       tab-size:4; /* 3. Use a more readable tab size (opinionated). */
-}
-
-/*
-Sections
-========
-*/
-body{
-  margin:0; /* Remove the margin in all browsers. */
-}
-
-/*
-Text-level semantics
-====================
-*/
-/**
-Add the correct font weight in Chrome and Safari.
-*/
-b,
-strong{
-  font-weight:bolder;
-}
-
-/**
-1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
-2. Correct the odd 'em' font sizing in all browsers.
-*/
-code,
-kbd,
-samp,
-pre{
-  font-family:ui-monospace, SFMono-Regular, Consolas, "Liberation Mono", Menlo, monospace; /* 1 */
-  font-size:1em; /* 2 */
-}
-
-/**
-Add the correct font size in all browsers.
-*/
-small{
-  font-size:80%;
-}
-
-/**
-Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
-*/
-sub,
-sup{
-  font-size:75%;
-  line-height:0;
-  position:relative;
-  vertical-align:baseline;
-}
-
-sub{
-  bottom:-0.25em;
-}
-
-sup{
-  top:-0.5em;
-}
-
-/*
-Tabular data
-============
-*/
-/**
-Correct table border color inheritance in Chrome and Safari. (https://issues.chromium.org/issues/40615503, https://bugs.webkit.org/show_bug.cgi?id=195016)
-*/
-table{
-  border-color:currentcolor;
-}
-
-/*
-Forms
-=====
-*/
-/**
-1. Change the font styles in all browsers.
-2. Remove the margin in Firefox and Safari.
-*/
-button,
-input,
-optgroup,
-select,
-textarea{
-  font-family:inherit; /* 1 */
-  font-size:100%; /* 1 */
-  line-height:1.15; /* 1 */
-  margin:0; /* 2 */
-}
-
-/**
-Correct the inability to style clickable types in iOS and Safari.
-*/
-button,
-[type=button],
-[type=reset],
-[type=submit]{
-  -webkit-appearance:button;
-}
-
-/**
-Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
-*/
-legend{
-  padding:0;
-}
-
-/**
-Add the correct vertical alignment in Chrome and Firefox.
-*/
-progress{
-  vertical-align:baseline;
-}
-
-/**
-Correct the cursor style of increment and decrement buttons in Safari.
-*/
-::-webkit-inner-spin-button,
-::-webkit-outer-spin-button{
-  height:auto;
-}
-
-/**
-1. Correct the odd appearance in Chrome and Safari.
-2. Correct the outline style in Safari.
-*/
-[type=search]{
-  -webkit-appearance:textfield; /* 1 */
-  outline-offset:-2px; /* 2 */
-}
-
-/**
-Remove the inner padding in Chrome and Safari on macOS.
-*/
-::-webkit-search-decoration{
-  -webkit-appearance:none;
-}
-
-/**
-1. Correct the inability to style clickable types in iOS and Safari.
-2. Change font properties to 'inherit' in Safari.
-*/
-::-webkit-file-upload-button{
-  -webkit-appearance:button; /* 1 */
-  font:inherit; /* 2 */
-}
-
-/*
-Interactive
-===========
-*/
-/*
-Add the correct display in Chrome and Safari.
-*/
-summary{
-  display:list-item;
-}
 [data-color-mode=light],
 :root{
   --basecolors-frame-contrast:#181c56;
@@ -190,8 +9,8 @@ summary{
   --basecolors-frame-subdued:#d9dae8;
   --basecolors-frame-tint:#f6f6f9;
   --basecolors-shape-accent:#181c56;
-  --basecolors-shape-bicycle-contrast:#00db9b;
-  --basecolors-shape-bicycle-default:#33826b;
+  --basecolors-shape-bicycle-contrast:#00dbb6;
+  --basecolors-shape-bicycle-default:#0d827e;
   --basecolors-shape-bus-contrast:#ff6392;
   --basecolors-shape-bus-default:#c5044e;
   --basecolors-shape-cableway-contrast:#b482fb;
@@ -210,8 +29,8 @@ summary{
   --basecolors-shape-maskalt:#ffffff;
   --basecolors-shape-metro-contrast:#f08901;
   --basecolors-shape-metro-default:#bf5826;
-  --basecolors-shape-mobility-contrast:#00db9b;
-  --basecolors-shape-mobility-default:#33826b;
+  --basecolors-shape-mobility-contrast:#00dbb6;
+  --basecolors-shape-mobility-default:#0d827e;
   --basecolors-shape-plane-contrast:#fbafea;
   --basecolors-shape-plane-default:#800664;
   --basecolors-shape-subdued:#626493;
@@ -256,8 +75,8 @@ summary{
   --basecolors-frame-subdued:#2d2e3e;
   --basecolors-frame-tint:#141527;
   --basecolors-shape-accent:#e5e5e9;
-  --basecolors-shape-bicycle-contrast:#4db295;
-  --basecolors-shape-bicycle-default:#4db295;
+  --basecolors-shape-bicycle-contrast:#4db2a1;
+  --basecolors-shape-bicycle-default:#4db2a1;
   --basecolors-shape-bus-contrast:#ef7398;
   --basecolors-shape-bus-default:#ef7398;
   --basecolors-shape-cableway-contrast:#b898e5;
@@ -276,8 +95,8 @@ summary{
   --basecolors-shape-maskalt:#393a49;
   --basecolors-shape-metro-contrast:#dd973c;
   --basecolors-shape-metro-default:#dd973c;
-  --basecolors-shape-mobility-contrast:#4db295;
-  --basecolors-shape-mobility-default:#4db295;
+  --basecolors-shape-mobility-contrast:#4db2a1;
+  --basecolors-shape-mobility-default:#4db2a1;
   --basecolors-shape-plane-contrast:#f2b8e5;
   --basecolors-shape-plane-default:#f2b8e5;
   --basecolors-shape-subdued:#b3b4bd;
@@ -426,6 +245,179 @@ summary{
   font-style:italic;
   font-display:swap;
 }
+@layer core.reset{
+  /*! modern-normalize v3.0.1 | MIT License | https://github.com/sindresorhus/modern-normalize */
+  /*
+  Document
+  ========
+  */
+  /**
+  Use a better box model (opinionated).
+  */
+  *,
+  ::before,
+  ::after{
+    -webkit-box-sizing:border-box;
+       -moz-box-sizing:border-box;
+            box-sizing:border-box;
+  }
+  html{
+    /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
+    font-family:system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+    line-height:1.15; /* 1. Correct the line height in all browsers. */
+    -webkit-text-size-adjust:100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
+    -moz-tab-size:4;
+      -o-tab-size:4;
+         tab-size:4; /* 3. Use a more readable tab size (opinionated). */
+  }
+  /*
+  Sections
+  ========
+  */
+  body{
+    margin:0; /* Remove the margin in all browsers. */
+  }
+  /*
+  Text-level semantics
+  ====================
+  */
+  /**
+  Add the correct font weight in Chrome and Safari.
+  */
+  b,
+  strong{
+    font-weight:bolder;
+  }
+  /**
+  1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
+  2. Correct the odd 'em' font sizing in all browsers.
+  */
+  code,
+  kbd,
+  samp,
+  pre{
+    font-family:ui-monospace, SFMono-Regular, Consolas, "Liberation Mono", Menlo, monospace; /* 1 */
+    font-size:1em; /* 2 */
+  }
+  /**
+  Add the correct font size in all browsers.
+  */
+  small{
+    font-size:80%;
+  }
+  /**
+  Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
+  */
+  sub,
+  sup{
+    font-size:75%;
+    line-height:0;
+    position:relative;
+    vertical-align:baseline;
+  }
+  sub{
+    bottom:-0.25em;
+  }
+  sup{
+    top:-0.5em;
+  }
+  /*
+  Tabular data
+  ============
+  */
+  /**
+  Correct table border color inheritance in Chrome and Safari. (https://issues.chromium.org/issues/40615503, https://bugs.webkit.org/show_bug.cgi?id=195016)
+  */
+  table{
+    border-color:currentcolor;
+  }
+  /*
+  Forms
+  =====
+  */
+  /**
+  1. Change the font styles in all browsers.
+  2. Remove the margin in Firefox and Safari.
+  */
+  button,
+  input,
+  optgroup,
+  select,
+  textarea{
+    font-family:inherit; /* 1 */
+    font-size:100%; /* 1 */
+    line-height:1.15; /* 1 */
+    margin:0; /* 2 */
+  }
+  /**
+  Correct the inability to style clickable types in iOS and Safari.
+  */
+  button,
+  [type=button],
+  [type=reset],
+  [type=submit]{
+    -webkit-appearance:button;
+  }
+  /**
+  Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
+  */
+  legend{
+    padding:0;
+  }
+  /**
+  Add the correct vertical alignment in Chrome and Firefox.
+  */
+  progress{
+    vertical-align:baseline;
+  }
+  /**
+  Correct the cursor style of increment and decrement buttons in Safari.
+  */
+  ::-webkit-inner-spin-button,
+  ::-webkit-outer-spin-button{
+    height:auto;
+  }
+  /**
+  1. Correct the odd appearance in Chrome and Safari.
+  2. Correct the outline style in Safari.
+  */
+  [type=search]{
+    -webkit-appearance:textfield; /* 1 */
+    outline-offset:-2px; /* 2 */
+  }
+  /**
+  Remove the inner padding in Chrome and Safari on macOS.
+  */
+  ::-webkit-search-decoration{
+    -webkit-appearance:none;
+  }
+  /**
+  1. Correct the inability to style clickable types in iOS and Safari.
+  2. Change font properties to 'inherit' in Safari.
+  */
+  ::-webkit-file-upload-button{
+    -webkit-appearance:button; /* 1 */
+    font:inherit; /* 2 */
+  }
+  /*
+  Interactive
+  ===========
+  */
+  /*
+  Add the correct display in Chrome and Safari.
+  */
+  summary{
+    display:list-item;
+  }
+  *,
+  *::before,
+  *::after{
+    -webkit-box-sizing:inherit;
+       -moz-box-sizing:inherit;
+            box-sizing:inherit;
+    font-weight:inherit;
+  }
+}
 [data-color-mode=light],
 [data-color-mode=dark],
 :root{
@@ -466,15 +458,6 @@ summary{
   }
 }
 
-*,
-*::before,
-*::after{
-  -webkit-box-sizing:inherit;
-     -moz-box-sizing:inherit;
-          box-sizing:inherit;
-  font-weight:inherit;
-}
-
 .eds-h1,
 .eds-h2,
 .eds-h3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entur/typography",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "license": "SEE LICENSE IN README.md",
   "main": "./dist/typography.cjs.js",
   "module": "./dist/typography.esm.js",
@@ -19,7 +19,7 @@
       "default": "./dist/beta/esm/index.mjs"
     },
     "./styles": "./dist/styles.css",
-    "./beta/styles": "./dist/beta/typography.css",
+    "./beta/styles": "./dist/beta/styles/index.css",
     "./fonts/*": "./fonts/*",
     "./scripts/*": "./scripts/*",
     "./package.json": "./package.json",
@@ -49,6 +49,7 @@
     "build:beta": "vite build --config vite.config.beta.ts",
     "test": "jest",
     "lint": "eslint src",
+    "lint:styles": "stylelint 'src/beta**/*.{css,scss}'  --ignore-path ../../.gitignore",
     "start": "vite build --watch",
     "start:beta": "vite build --config vite.config.beta.ts --watch",
     "migrate": "./scripts/migrate-typography.mjs"
@@ -58,9 +59,9 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@entur/icons": "^8.3.0",
-    "@entur/tokens": "^3.20.0",
-    "@entur/utils": "^0.12.5",
+    "@entur/icons": "^8.3.1",
+    "@entur/tokens": "^3.21.0",
+    "@entur/utils": "^0.13.0",
     "classnames": "^2.5.1",
     "modern-normalize": "^3.0.1"
   },
@@ -80,5 +81,5 @@
     "vite": "^7.1.3",
     "vite-plugin-dts": "^4.5.4"
   },
-  "gitHead": "cffff0dfd89f80b9311b1cb79cbb42926597af5d"
+  "gitHead": "3239ff1bcfdabbfef65f5d84577a626918ee2410"
 }