Skip to content

Commit c020640

Browse files
mfranzkemfranzke
committed
Merge branch 'main' into dbux-3
2 parents 6963cbf + 6592e1e commit c020640

File tree

18 files changed

+125
-90
lines changed

18 files changed

+125
-90
lines changed

‎.github/workflows/default.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Default push workflow
22

33
on:
4+
pull_request:
45
push:
56
branches:
6-
- "**"
7-
tags:
8-
- "!**"
7+
- "main"
8+
- "dbux-3"
99

1010
jobs:
1111
init:
@@ -27,6 +27,13 @@ jobs:
2727
uses: ./.github/workflows/01-build.yml
2828
needs: [init]
2929

30+
checks-done:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- name: 🎉 Checks done
34+
run: echo "🎉 All tests & build were successful."
35+
needs: [build, test, lint]
36+
3037
deploy:
3138
uses: ./.github/workflows/02-deploy-gh-pages.yml
3239
if: ${{ github.actor != 'dependabot[bot]' && github.owner == 'db-ui' }}

‎.vscode/extensions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"editorconfig.editorconfig",
4-
"henrynguyen5-vsc.vsc-nvm"
4+
"henrynguyen5-vsc.vsc-nvm",
5+
"streetsidesoftware.code-spell-checker"
56
]
67
}

‎CHANGELOG.md‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Changelog
44

5-
All notable changes to this project will be documented in this file.
5+
From now on we'll only document our changes within the [repositories releases page](https://github.com/db-ui/core/releases).
6+
7+
~~All notable changes to this project will be documented in this file.~~
68

79
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
810
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
@@ -12,7 +14,7 @@ Regarding BREAKING CHANGES in between, please have a look into [the migration gu
1214

1315
And we're still hosting the `CHANGELOG` for any changes up until version 2.0.0 within our internal Git: <https://db.de/lwfv2o> (you need to be logged in to our Deutsche Bahn VPN for these informations)
1416

15-
<!-- ## [2.0.0] - 2022-XX-XX
17+
## [2.0.0] - 2022-10-14
1618

1719
This part includes all of the changes from `@db-ui/[email protected]` to `@db-ui/[email protected]` – this summarizes the changes out of the previous prereleases, and is especially only including the relevant aspects for consumers of our package (so we've left out the DB UI Core contributors relevant aspects).
1820

@@ -77,13 +79,7 @@ In general we've introduced the possibility to control variants and configuratio
7779
- **BREAKING CHANGE** / Polyfills: As both [`details`/`summary`](https://caniuse.com/details) and [`dialog`](https://caniuse.com/dialog) elements reached great support in modern browsers these days, we're only including those for demo purposes from now on, but not as regular `dependencies` any more.
7880
- The DB Webfonts files have been updated
7981
- refactor: removing last `bulma` remains. While this is still a great framework, our codebase is now mature enough to even also work without it. [!350]
80-
- The DB Webfonts files have been updated -->
81-
82-
## [Unreleased]
83-
84-
### Added
85-
86-
- Loading Indicator: introduced new Loadingindicator (Circular Loading Spinner)
82+
- The DB Webfonts files have been updated
8783

8884
## [2.0.0-48] - 2022-08-05
8985

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"pretty-quick": "^3.1.3",
9797
"rimraf": "^3.0.2",
9898
"sass": "^1.55.0",
99-
"stylelint": "^14.13.0",
99+
"stylelint": "^14.14.0",
100100
"stylelint-config-prettier": "^9.0.3",
101101
"stylelint-config-sass-guidelines": "^9.0.1",
102102
"validate-branch-name": "^1.3.0",

‎source/_patterns/00-base/_init.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,12 @@ nav,
5858
);
5959
}
6060
}
61+
62+
// List style / https://marketingportal.extranet.deutschebahn.com/de/brandguide/typografie-1#8e0be060-c2f5-42a1-abbc-6b050845d73c~paragraph--image_link
63+
:where(ul) {
64+
list-style-type: "\2022"+ "   ";
65+
66+
li::marker {
67+
color: $db-color-red-500;
68+
}
69+
}

‎source/_patterns/00-base/type/_fonts.variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $font-families: (
1313
"font-family": "DB Screen Head",
1414
"font-filename": "dbscreenhead-black",
1515
// black/"bold" font weight
16-
"font-weight": 700,
16+
"font-weight": 900,
1717
"font-style": normal,
1818
"font-local": true
1919
),

‎source/_patterns/01-elements/headline/_headline.variables.scss‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
@import "../../../css/helpers/functions";
22

3-
$rea-main-h1-font-size: to-rem(
4-
$pxValue: 36
5-
) !default; // * TODO: possibly rework variable naming
6-
$rea-main-h2-font-size: to-rem(
7-
$pxValue: 24
8-
) !default; // * TODO: possibly rework variable naming
9-
$rea-main-h3-font-size: to-rem(
10-
$pxValue: 20
11-
) !default; // * TODO: possibly rework variable naming
12-
$rea-main-h4-font-size: to-rem(
13-
$pxValue: 18
14-
) !default; // * TODO: possibly rework variable naming
3+
// * TODO: possibly rework variable naming
4+
$rea-main-h1-font-size: 36 !default;
5+
$rea-main-h1-font-size-small: 28 !default;
6+
$rea-main-h2-font-size: 24 !default;
7+
$rea-main-h2-font-size-small: 20 !default;
8+
$rea-main-h3-font-size: 20 !default;
9+
$rea-main-h3-font-size-small: 18 !default;
10+
$rea-main-h4-font-size: 18 !default;
11+
$rea-main-h4-font-size-small: 16 !default;

‎source/_patterns/01-elements/headline/headline.scss‎

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1+
@use "sass:math";
12
@import "headline.variables";
23

3-
h1,
4-
h2,
5-
h3 {
6-
&.elm-headline {
7-
font-family: $db-font-family-head;
8-
}
9-
}
10-
114
.elm-headline {
125
margin-bottom: to-rem($pxValue: 16);
136

@@ -19,31 +12,68 @@ h1,
1912
h2,
2013
h3 {
2114
&.elm-headline {
22-
font-weight: 700;
15+
font-family: $db-font-family-headline;
16+
font-weight: 900;
2317
}
2418
}
2519

26-
h4 {
20+
h1 {
2721
&.elm-headline {
28-
font-size: $rea-main-h4-font-size; // * TODO: possibly rework variable naming
29-
font-weight: 400;
22+
font-size: to-rem(
23+
$pxValue: $rea-main-h1-font-size
24+
); // * TODO: possibly rework variable naming
25+
line-height: math.div(40, $rea-main-h1-font-size);
26+
@media screen and (max-width: 767px) {
27+
font-size: to-rem(
28+
$pxValue: $rea-main-h1-font-size-small
29+
); // * TODO: possibly rework variable naming
30+
line-height: 1.14;
31+
}
3032
}
3133
}
3234

33-
h1 {
35+
h2 {
3436
&.elm-headline {
35-
font-size: $rea-main-h1-font-size; // * TODO: possibly rework variable naming
37+
font-size: to-rem(
38+
$pxValue: $rea-main-h2-font-size
39+
); // * TODO: possibly rework variable naming
40+
line-height: math.div(28, $rea-main-h2-font-size);
41+
@media screen and (max-width: 767px) {
42+
font-size: to-rem(
43+
$pxValue: $rea-main-h2-font-size-small
44+
); // * TODO: possibly rework variable naming
45+
line-height: 1.2;
46+
}
3647
}
3748
}
3849

39-
h2 {
50+
h3 {
4051
&.elm-headline {
41-
font-size: $rea-main-h2-font-size; // * TODO: possibly rework variable naming
52+
font-size: to-rem(
53+
$pxValue: $rea-main-h3-font-size
54+
); // * TODO: possibly rework variable naming
55+
line-height: math.div(24, $rea-main-h3-font-size);
56+
@media screen and (max-width: 767px) {
57+
font-size: to-rem(
58+
$pxValue: $rea-main-h3-font-size-small
59+
); // * TODO: possibly rework variable naming
60+
line-height: 1.33;
61+
}
4262
}
4363
}
4464

45-
h3 {
65+
h4 {
4666
&.elm-headline {
47-
font-size: $rea-main-h3-font-size; // * TODO: possibly rework variable naming
67+
font-size: to-rem(
68+
$pxValue: $rea-main-h4-font-size
69+
); // * TODO: possibly rework variable naming
70+
font-weight: 400;
71+
line-height: math.div(24, $rea-main-h4-font-size);
72+
@media screen and (max-width: 767px) {
73+
font-size: to-rem(
74+
$pxValue: $rea-main-h4-font-size-small
75+
); // * TODO: possibly rework variable naming
76+
line-height: 1.25;
77+
}
4878
}
4979
}

‎source/_patterns/01-elements/select/_select.hbs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
{{#if aria-invalid }} aria-invalid="{{ aria-invalid }}" {{/if }}
77
{{#if variant}} data-variant="{{variant}}"{{/if }}>
88
{{#if optgroup}}<optgroup label="Devices">{{else}}{{#unless multiple}}<option></option>{{/unless}}{{/if }}
9-
<option value="Row 1">Smartphone</option>
10-
<option>Softphone</option>
11-
<option>Headphone</option>
12-
<option disabled>Row 4 / disabled</option>
9+
<option value="smartphone">Smartphone</option>
10+
<option value="softphone">Softphone</option>
11+
<option value="headset">Headset</option>
12+
<option value="fax" disabled>Fax / disabled</option>
1313
{{#if optgroup}}
1414
</optgroup>
1515
<optgroup label="Roles">
16-
<option>User</option>
17-
<option>Tester</option>
18-
<option>Developer</option>
16+
<option value="user">User</option>
17+
<option value="tester">Tester</option>
18+
<option value="developer">Developer</option>
1919
</optgroup>{{/if }}
2020
</select>
2121
<label class="elm-label" for="{{ id }}">{{ label }}</label>

0 commit comments

Comments
 (0)