From dc77076aa564124eb060a0f074b6adca5e948f87 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 21 Nov 2024 14:35:09 +0100 Subject: [PATCH 1/4] refactor: don't use JS if it's a simple key/value topic --- .config/.lintstagedrc-prettier.js | 3 --- .config/.lintstagedrc-prettier.json | 1 + .lintstagedrc => .config/.lintstagedrc.json | 0 .husky/pre-commit | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 .config/.lintstagedrc-prettier.js create mode 100644 .config/.lintstagedrc-prettier.json rename .lintstagedrc => .config/.lintstagedrc.json (100%) diff --git a/.config/.lintstagedrc-prettier.js b/.config/.lintstagedrc-prettier.js deleted file mode 100644 index 655bfb5784..0000000000 --- a/.config/.lintstagedrc-prettier.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - '**/*': 'prettier --write --ignore-unknown' -}; diff --git a/.config/.lintstagedrc-prettier.json b/.config/.lintstagedrc-prettier.json new file mode 100644 index 0000000000..23bbc43203 --- /dev/null +++ b/.config/.lintstagedrc-prettier.json @@ -0,0 +1 @@ +{ "**/*": "prettier --write --ignore-unknown" } diff --git a/.lintstagedrc b/.config/.lintstagedrc.json similarity index 100% rename from .lintstagedrc rename to .config/.lintstagedrc.json diff --git a/.husky/pre-commit b/.husky/pre-commit index 9c7d2a32ee..dfb5910db4 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,9 +1,9 @@ echo "### validate branch name ###" validate-branch-name echo "### lint staged files ###" -lint-staged +lint-staged --config .config/.lintstagedrc.json echo "### prettify staged files ###" -lint-staged --config .config/.lintstagedrc-prettier.js +lint-staged --config .config/.lintstagedrc-prettier.json git update-index --again echo "### check for commit mail ###" node ./scripts/check-commit-mail.mjs From ea780498ff6712c68912dffe9da0ab6c18236b62 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 21 Nov 2024 14:36:37 +0100 Subject: [PATCH 2/4] refactor: added new icons config --- .../00-base/icons/_icons.font-faces.scss | 8 ++++---- .../_patterns/00-base/icons/_icons.variables.scss | 13 +++++++++---- .../icons/enterprise/_icons.font-faces.scss | 8 ++++---- .../icons/icon-library~20-outline-action.json | 15 +++++++++++++++ .../icons/icon-library~24-outline-action.json | 15 +++++++++++++++ .../icons/icon-library~32-outline-action.json | 15 +++++++++++++++ 6 files changed, 62 insertions(+), 12 deletions(-) diff --git a/source/_patterns/00-base/icons/_icons.font-faces.scss b/source/_patterns/00-base/icons/_icons.font-faces.scss index 80f0f2f47b..840dda4a5f 100644 --- a/source/_patterns/00-base/icons/_icons.font-faces.scss +++ b/source/_patterns/00-base/icons/_icons.font-faces.scss @@ -9,9 +9,9 @@ font-display: block; font-family: "missing-icons"; src: - url("#{$icons-path}functional/fonts/icons-empty.woff2?4r2098") + url("#{$icons-path}functional/fonts/icons-empty.woff2?4r2099") format("woff2"), - url("#{$icons-path}functional/fonts/icons-empty.woff?4r2098") + url("#{$icons-path}functional/fonts/icons-empty.woff?4r2099") format("woff"); } @@ -28,9 +28,9 @@ font-style: normal; font-weight: normal; src: - url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff2?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff2?4r2099") format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff?4r2099") format("woff"); unicode-range: string.unquote($icon-font-unicodes); diff --git a/source/_patterns/00-base/icons/_icons.variables.scss b/source/_patterns/00-base/icons/_icons.variables.scss index 0bda992dc8..e884622820 100644 --- a/source/_patterns/00-base/icons/_icons.variables.scss +++ b/source/_patterns/00-base/icons/_icons.variables.scss @@ -325,7 +325,12 @@ $icon-glyphs-personenverkehr: ( "transportation-underground": "\e90e", "transportation-walking": "\e90f", "ev-bus": "\e928", - "ev-train": "\e929" + "ev-train": "\e929", + "artificial-intelligence": "\e1304", + "document-cross": "\e1305", + "euro-sign": "\e1306", + "id-card": "\e1307", + "pulse-wave": "\e1308" ) !default; $icon-font-families-personenverkehr: ( @@ -340,7 +345,7 @@ $icon-font-families-personenverkehr: ( ), 20: ( "action": ( - "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295" + "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295,U+e1304-e1308" ), "av": ( "U+23ED-23EE,U+23F8,U+25A1,U+25B7,U+293A-293B,U+e1085-e1088,U+e1091,U+e1234,U+e1261-e1259,U+e1262,U+e1296-e1297" @@ -390,7 +395,7 @@ $icon-font-families-personenverkehr: ( ), 24: ( "action": ( - "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295" + "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295,U+e1304-e1308" ), "av": ( "U+23ED-23EE,U+23F8,U+25A1,U+25B7,U+293A-293B,U+e1085-e1088,U+e1091,U+e1234,U+e1259-e1262,U+e1296-e1297" @@ -440,7 +445,7 @@ $icon-font-families-personenverkehr: ( ), 32: ( "action": ( - "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295" + "U+002B,U+003F,U+00A7,U+1F441,U+1F5A8,U+1F5B9,U+1F5BC,U+1F5D1,U+1F6C8,U+1F6CD,U+1F6E0,U+219F,U+21A1,U+21A6,U+21C6,U+21E7,U+21E9,U+21F5,U+2212,U+2295,U+229D,U+238C,U+25F9,U+2601,U+2606,U+2661,U+2699,U+270F,U+2713,U+2B73,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+e1154-e1156,U+e1164-e1171,U+e1187,U+e1211-e1214,U+e1220-e1258,U+e1290-e1295,U+e1304-e1308" ), "av": ( "U+23ED-23EE,U+23F8,U+25A1,U+25B7,U+293A-293B,U+e1085-e1088,U+e1091,U+e1234,U+e1259-e1262,U+e1296-e1297" diff --git a/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss b/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss index 4ac49d7ec7..47a20c937b 100644 --- a/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss +++ b/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss @@ -16,9 +16,9 @@ font-style: normal; font-weight: normal; src: - url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff2?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff2?4r2099") format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff?4r2099") format("woff"); } } @@ -29,9 +29,9 @@ font-style: normal; font-weight: normal; src: - url("#{$icons-path}functional/fonts/#{$icon-style}.woff2?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-style}.woff2?4r2099") format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-style}.woff?4r2098") + url("#{$icons-path}functional/fonts/#{$icon-style}.woff?4r2099") format("woff"); } } diff --git a/source/_patterns/00-base/icons/icon-library~20-outline-action.json b/source/_patterns/00-base/icons/icon-library~20-outline-action.json index 5614b93964..657598e44f 100644 --- a/source/_patterns/00-base/icons/icon-library~20-outline-action.json +++ b/source/_patterns/00-base/icons/icon-library~20-outline-action.json @@ -26,6 +26,9 @@ { "icon-glyph": "alert-off" }, + { + "icon-glyph": "artificial-intelligence" + }, { "icon-glyph": "attachment" }, @@ -89,6 +92,9 @@ { "icon-glyph": "document-check" }, + { + "icon-glyph": "document-cross" + }, { "icon-glyph": "done" }, @@ -101,6 +107,9 @@ { "icon-glyph": "edit" }, + { + "icon-glyph": "euro-sign" + }, { "icon-glyph": "face-delighted" }, @@ -146,6 +155,9 @@ { "icon-glyph": "help" }, + { + "icon-glyph": "id-card" + }, { "icon-glyph": "image" }, @@ -185,6 +197,9 @@ { "icon-glyph": "print" }, + { + "icon-glyph": "pulse-wave" + }, { "icon-glyph": "push-button" }, diff --git a/source/_patterns/00-base/icons/icon-library~24-outline-action.json b/source/_patterns/00-base/icons/icon-library~24-outline-action.json index 0618a9f0f5..158ec97b3b 100644 --- a/source/_patterns/00-base/icons/icon-library~24-outline-action.json +++ b/source/_patterns/00-base/icons/icon-library~24-outline-action.json @@ -27,6 +27,9 @@ { "icon-glyph": "alert-off" }, + { + "icon-glyph": "artificial-intelligence" + }, { "icon-glyph": "attachment" }, @@ -90,6 +93,9 @@ { "icon-glyph": "document-check" }, + { + "icon-glyph": "document-cross" + }, { "icon-glyph": "done" }, @@ -102,6 +108,9 @@ { "icon-glyph": "edit" }, + { + "icon-glyph": "euro-sign" + }, { "icon-glyph": "face-delighted" }, @@ -147,6 +156,9 @@ { "icon-glyph": "help" }, + { + "icon-glyph": "id-card" + }, { "icon-glyph": "image" }, @@ -186,6 +198,9 @@ { "icon-glyph": "print" }, + { + "icon-glyph": "pulse-wave" + }, { "icon-glyph": "push-button" }, diff --git a/source/_patterns/00-base/icons/icon-library~32-outline-action.json b/source/_patterns/00-base/icons/icon-library~32-outline-action.json index 5f47027ac1..45e4dff398 100644 --- a/source/_patterns/00-base/icons/icon-library~32-outline-action.json +++ b/source/_patterns/00-base/icons/icon-library~32-outline-action.json @@ -26,6 +26,9 @@ { "icon-glyph": "alert-off" }, + { + "icon-glyph": "artificial-intelligence" + }, { "icon-glyph": "attachment" }, @@ -89,6 +92,9 @@ { "icon-glyph": "document-check" }, + { + "icon-glyph": "document-cross" + }, { "icon-glyph": "done" }, @@ -101,6 +107,9 @@ { "icon-glyph": "edit" }, + { + "icon-glyph": "euro-sign" + }, { "icon-glyph": "face-delighted" }, @@ -146,6 +155,9 @@ { "icon-glyph": "help" }, + { + "icon-glyph": "id-card" + }, { "icon-glyph": "image" }, @@ -185,6 +197,9 @@ { "icon-glyph": "print" }, + { + "icon-glyph": "pulse-wave" + }, { "icon-glyph": "push-button" }, From 3cbcf52a5e96e26e454a23ee9f36a7dba1040203 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 21 Nov 2024 14:40:57 +0100 Subject: [PATCH 3/4] refactor: updated DB UI Base to the prerelease --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 889f71edf1..a3bb2853df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.1.1", - "@db-ui/base": "^0.28.4" + "@db-ui/base": "^0.29.0-0" }, "devDependencies": { "@babel/cli": "^7.25.9", @@ -1977,9 +1977,10 @@ } }, "node_modules/@db-ui/base": { - "version": "0.28.4", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-0.28.4.tgz", - "integrity": "sha512-7rTfXIFcrZ5bb8x80nDMd87GPSMgI8qWEBZOa/jPq3mYkClS+ljOxTt6bLTw16EAjvmrkS93ZY56y9Q2Y/LWZA==" + "version": "0.29.0-0-708ed14", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-0.29.0-0-708ed14.tgz", + "integrity": "sha512-Xbk8Jnq8hRKiYkltuos4cDzlmn4TdQjwUaNN5CJ3uYXw6CeUb+0/8Z1aEAC+TDex7MstL6L9wjo4NXbuql1p0w==", + "license": "Apache-2.0" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", @@ -21372,9 +21373,9 @@ "requires": {} }, "@db-ui/base": { - "version": "0.28.4", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-0.28.4.tgz", - "integrity": "sha512-7rTfXIFcrZ5bb8x80nDMd87GPSMgI8qWEBZOa/jPq3mYkClS+ljOxTt6bLTw16EAjvmrkS93ZY56y9Q2Y/LWZA==" + "version": "0.29.0-0-708ed14", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-0.29.0-0-708ed14.tgz", + "integrity": "sha512-Xbk8Jnq8hRKiYkltuos4cDzlmn4TdQjwUaNN5CJ3uYXw6CeUb+0/8Z1aEAC+TDex7MstL6L9wjo4NXbuql1p0w==" }, "@eslint-community/eslint-utils": { "version": "4.4.0", diff --git a/package.json b/package.json index 5e1f53bb51..7cb537a9c3 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.1.1", - "@db-ui/base": "^0.28.4" + "@db-ui/base": "^0.29.0-0" }, "devDependencies": { "@babel/cli": "^7.25.9", From 610beefb81fcf98f2f9ada33ac7a37b40fadd09c Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 21 Nov 2024 15:02:40 +0100 Subject: [PATCH 4/4] refactor(docs): added further missing icons --- .../00-base/icons/illustration-icons.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/source/_patterns/00-base/icons/illustration-icons.json b/source/_patterns/00-base/icons/illustration-icons.json index a77f892da0..8b064c1798 100644 --- a/source/_patterns/00-base/icons/illustration-icons.json +++ b/source/_patterns/00-base/icons/illustration-icons.json @@ -84,6 +84,9 @@ { "icon": "communication/db_ic_il_customer_feedback" }, + { + "icon": "communication/db_ic_il_customer_satisfaction" + }, { "icon": "communication/db_ic_il_envelope_check" }, @@ -96,6 +99,9 @@ { "icon": "communication/db_ic_il_envelope_open" }, + { + "icon": "communication/db_ic_il_envelope_open_at_sign" + }, { "icon": "communication/db_ic_il_error" }, @@ -162,6 +168,15 @@ }, { "icon": "devices/db_ic_il_tablet" + }, + { + "icon": "devices/db_ic_il_usb_3.0" + }, + { + "icon": "devices/db_ic_il_usb_c" + }, + { + "icon": "devices/db_ic_il_widget" } ], "Entertainment": [ @@ -261,6 +276,12 @@ } ], "Ticket": [ + { + "icon": "ticket/db_ic_il_children_traveling_alone" + }, + { + "icon": "ticket/db_ic_il_children_traveling_with" + }, { "icon": "ticket/db_ic_il_classic_printout" }, @@ -367,6 +388,10 @@ { "icon": "travel/db_ic_il_bear" }, + + { + "icon": "travel/db_ic_il_children_traveling_alone" + }, { "icon": "travel/db_ic_il_db_comfort_checkin" }, @@ -379,6 +404,9 @@ { "icon": "travel/db_ic_il_id_card" }, + { + "icon": "travel/db_ic_il_inexperienced_travelers" + }, { "icon": "travel/db_ic_il_itinerary" }, @@ -388,6 +416,9 @@ { "icon": "travel/db_ic_il_luggage" }, + { + "icon": "travel/db_ic_il_luggage_service" + }, { "icon": "travel/db_ic_il_passenger_rights" }, @@ -397,6 +428,9 @@ { "icon": "travel/db_ic_il_poi_berlin" }, + { + "icon": "travel/db_ic_il_senior_travelers" + }, { "icon": "travel/db_ic_il_suitcase" }, @@ -406,6 +440,12 @@ { "icon": "travel/db_ic_il_transportation_advertising" }, + { + "icon": "travel/db_ic_il_travelers_with_reduced_mobility" + }, + { + "icon": "travel/db_ic_il_travelers_with_support_needs" + }, { "icon": "travel/db_ic_il_zuginformation" }