Skip to content

Commit 2794c61

Browse files
committed
Merge branch 'main' into dbux-3
2 parents e826142 + dc1586f commit 2794c61

File tree

16 files changed

+688
-624
lines changed

16 files changed

+688
-624
lines changed

.github/workflows/00-scan-secrets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
id: extract_branch
1818

1919
- name: 🐷 TruffleHog OSS
20-
uses: trufflesecurity/trufflehog@v3.19.0
20+
uses: trufflesecurity/trufflehog@v3.25.1
2121
with:
2222
path: ./
2323
base: ${{ steps.extract_branch.outputs.branch-name }}

.markdown-lint.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ MD026:
2929
MD028: false
3030
MD029: false # Ordered list item prefix
3131
MD030: false
32-
MD033: false # Allow inline HTML
33-
MD034: false
3432
MD036: false # Emphasis used instead of a heading
3533
MD049: false # emphasis-style Emphasis style should be consistent
3634
MD053: false

.mdlrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rules "~MD002", "~MD010", "~MD013", "~MD024", "~MD033"
1+
rules "~MD002", "~MD010", "~MD013", "~MD024"

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<!-- markdownlint-configure-file { "MD013": false, "MD041":false } -->
22

3+
<!-- markdownlint-disable MD033 -->
4+
35
<img src="source/samples/images/header_image_0.guetzli.jpg" alt="" srcset="source/samples/images/header_image_0.guetzli.2x.jpg 2x, source/samples/images/header_image_0.guetzli.3x.jpg 3x"> <!-- width="830" height="276" //-->
46

7+
<!-- markdownlint-enable MD033 -->
8+
59
# DB UI Core
610

711
![Apache 2.0 license badge](https://img.shields.io/badge/License-Apache_2.0-blue.svg)
@@ -15,7 +19,7 @@
1519

1620
<!-- ![Pipeline status](https://github.com/db-ui/core/badges/main/pipeline.svg?style=flat) -->
1721

18-
DB Personenverkehr and DB Systel are merging their Design Systems for Web [with DB Design System](https://marketingportal.extranet.deutschebahn.com/de/ui-komponenten) as their successor. Our goal is to provide a common UX based on the [DB "Moderne Ikone"](https://marketingportal.extranet.deutschebahn.com/marke) for customer and employee applications. To achieve an end 2 end consistence from conception to implementation, we'll provide this new version of DB UI Core (npm: `@db-ui/core`), that is being used within a Design System by T.R (Reisendeninformation) as well. Stay Tuned!
22+
DB Personenverkehr and DB Systel are merging their Design Systems for Web [with DB Design System](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/DB-UX-Design-System/Design-fuer-Apps-Web/UI-Komponenten) as their successor. Our goal is to provide a common UX based on the [DB "Moderne Ikone"](https://marketingportal.extranet.deutschebahn.com/marke) for customer and employee applications. To achieve an end 2 end consistence from conception to implementation, we'll provide this new version of DB UI Core (npm: `@db-ui/core`), that is being used within a Design System by T.R (Reisendeninformation) as well. Stay Tuned!
1923

2024
You could still use the existing version of [DB UI Core that is based on version 1.6 of the guidelines (only hosted internally)](https://db.de/4cwtyn). For new projects we recommend to use this new version.
2125

@@ -41,7 +45,7 @@ DB UI Core provides robust HTML UI components, reusable visual styles, and power
4145

4246
### Consistent & Compliant
4347

44-
DB UI Core is based on the [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/de/ui-komponenten), that are the guidelines for any Personenverkehr Customer and Deutsche Bahn Enterprise website and web applications.
48+
DB UI Core is based on the [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/DB-UX-Design-System/Design-fuer-Apps-Web/UI-Komponenten), that are the guidelines for any Personenverkehr Customer and Deutsche Bahn Enterprise website and web applications.
4549

4650
### Accessible
4751

@@ -57,13 +61,13 @@ DB UI Core is decoupled from the JavaScript layer, to implement the patterns in
5761

5862
### Evergreen
5963

60-
As [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/de/ui-komponenten) evolves, so does DB UI Core, meaning apps only need to keep their DB UI Core package updated to ensure the latest look and feel.
64+
As [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/DB-UX-Design-System/Design-fuer-Apps-Web/UI-Komponenten) evolves, so does DB UI Core, meaning apps only need to keep their DB UI Core package updated to ensure the latest look and feel.
6165

6266
## More information
6367

6468
Additionally we'll provide some more information over time regrading the whole ecosystem:
6569

66-
- [DB UX Design System documentation within the DB Marketingportal (german)](https://marketingportal.extranet.deutschebahn.com/de/ui-komponenten)
70+
- [DB UX Design System documentation within the DB Marketingportal (german)](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/DB-UX-Design-System/Design-fuer-Apps-Web/UI-Komponenten)
6771
- [Confluence / Base Wiki - "Technische Umsetzung des Enterprise UI Design Systems" (german, only available internally)](https://db.de/pu8moh)
6872
- [Confluence - Web UI Component Library (only available internally)](https://db.de/1tyr73)
6973
- [Changelog](https://github.com/db-ui/core/blob/main/CHANGELOG.md)
@@ -107,7 +111,7 @@ Please mind the [conventions for git commits](/docs/conventions.adoc#user-conten
107111

108112
<!-- markdownlint-disable MD033 -->
109113

110-
This is only the first version of our framework and we really want your feedback - either within the <a href="https://db.de/krnm74" target="_blank" rel="noopener noreferrer">DB UI Channel by Web Dev Community in Microsoft Teams (only available DB internally)</a>, or directly at [[email protected]](mailto:[email protected]). <!-- markdownlint-disable MD033 -->
114+
This is only the first version of our framework and we really want your feedback - either within the <a href="https://db.de/krnm74" target="_blank" rel="noopener noreferrer">DB UI Channel by Web Dev Community in Microsoft Teams (only available DB internally)</a>, or directly at [[email protected]](mailto:[email protected]).
111115
We're particularly keen to add as many examples to the behaviours as possible, to further clarify them.
112116

113117
## FAQ
@@ -132,7 +136,7 @@ src\styles.scss 5:9 root stylesheet
132136
## Deutsche Bahn brand
133137
134138
As we'd like to perfectly support our users and customers on their digital journey, the usage of Deutsche Bahn brand and trademarks are bound to clear guidelines and restrictions even when being used with the code that we're providing with this product; Deutsche Bahn fully reserves all rights and ownership regarding the Deutsche Bahn brand, even though that we're providing the code of DB UI products free to use and release it under the Apache 2.0 license.
135-
Please have a look at our brand portal at <https://marketingportal.extranet.deutschebahn.com/> for any further questions and whom to contact on any brand issues. As these assets and visual guidelines are retrieved from our Deutsche Bahn Marketingportal, you'll agree with the ["Allgemeine Nutzungsbedingungen für das DB-Marketingportal" (german)](https://marketingportal.extranet.deutschebahn.com/de/nutzungsbedingungen) in case of using them.
139+
Please have a look at our brand portal at <https://marketingportal.extranet.deutschebahn.com/> for any further questions and whom to contact on any brand issues. As these assets and visual guidelines are retrieved from our Deutsche Bahn Marketingportal, you'll agree with the ["Allgemeine Nutzungsbedingungen für das DB-Marketingportal" (german)](https://marketingportal.extranet.deutschebahn.com/marketingportal/Nutzungsbedingungen-9702684) in case of using them.
136140

137141
For any usage outside of Deutsche Bahn websites and applications you must remove or replace any Deutsche Bahn brand and design assets as well as protected characteristics and trademarks. We're even also planning to provide a neutral theme that would make it much easier for you to use our product without the trademarks by Deutsche Bahn.
138142

docs/adr/intro.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The purpose of this product is providing a stable and most generic library of Fr
44

55
____
66
7-
Design systems are containers for institutional knowledge. They provide tested and proven solutions to design problems. When these solutions are held together by a consistent visual language and link:https://marketingportal.extranet.deutschebahn.com/de/ui-komponenten[UX guidelines], they represent what good design looks like for the organization or platform.
7+
Design systems are containers for institutional knowledge. They provide tested and proven solutions to design problems. When these solutions are held together by a consistent visual language and link:https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/DB-UX-Design-System/Design-fuer-Apps-Web/UI-Komponenten[UX guidelines], they represent what good design looks like for the organization or platform.
88
____
99
____
1010
For projects like this one, we work with our client partners to identify the design problems their teams confront over and over again. And then we identify and extract the best solutions to those problems.

0 commit comments

Comments
 (0)