Skip to content

Commit 7cfb1e0

Browse files
committed
Merge branch 'main' into dbux-3
2 parents 3c5ce59 + 4afe7c1 commit 7cfb1e0

File tree

16 files changed

+3137
-4418
lines changed

16 files changed

+3137
-4418
lines changed

.github/actions/extract-branch/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
script: |
1717
return (
1818
context?.payload?.pull_request?.head?.ref ||
19-
context?.payload?.ref
19+
context?.payload?.ref || ""
2020
).replace("refs/heads/","");
2121
- name: 🪑 Set output
2222
id: branch-name

.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/[email protected].0
20+
uses: trufflesecurity/[email protected].3
2121
with:
2222
path: ./
2323
base: ${{ steps.extract_branch.outputs.branch-name }}

package-lock.json

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

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"prepare": "node -e \"try { require('husky').install() } catch (e) {}\""
5050
},
5151
"validate-branch-name": {
52-
"pattern": "((dbux-3)|(dependabot-)|^((test|feat|fix|chore|docs|refactor|style|ci|perf)\\-[a-zA-Z0-9\\-]+)$)",
52+
"pattern": "((dbux-3)|(dependabot-)|^((test|feat|fix|chore|docs|refactor|style|ci|perf|[0-9]+)\\-[a-zA-Z0-9\\-]+)$)",
5353
"errorMsg": "There is something wrong with your branch name. You should rename your branch to a valid name and try again. See the Pattern below."
5454
},
5555
"keywords": [],
@@ -64,23 +64,23 @@
6464
},
6565
"devDependencies": {
6666
"@babel/cli": "^7.19.3",
67-
"@babel/preset-env": "^7.19.4",
68-
"@commitlint/cli": "^17.1.2",
69-
"@commitlint/config-conventional": "^17.1.0",
67+
"@babel/preset-env": "^7.20.2",
68+
"@commitlint/cli": "^17.2.0",
69+
"@commitlint/config-conventional": "^17.2.0",
7070
"@mfranzke/plugin-node-uiextension": "^1.0.0",
7171
"@pattern-lab/cli": "^5.17.0",
7272
"@pattern-lab/core": "^5.17.0",
7373
"@pattern-lab/engine-handlebars": "^5.16.4",
7474
"@pattern-lab/starterkit-handlebars-demo": "^5.16.4",
7575
"@pattern-lab/uikit-workshop": "^5.17.0",
76-
"autoprefixer": "^10.4.12",
77-
"backstopjs": "^6.1.3",
76+
"autoprefixer": "^10.4.13",
77+
"backstopjs": "^6.1.4",
7878
"cpr": "^3.0.1",
7979
"details-element-polyfill": "^2.4.0",
8080
"dialog-polyfill": "^0.5.6",
8181
"dotenv": "^16.0.3",
8282
"find-versions-cli": "^4.0.0",
83-
"html-validate": "^7.7.1",
83+
"html-validate": "^7.8.0",
8484
"html5-boilerplate": "^8.0.0",
8585
"husky": "^8.0.1",
8686
"iframe-resizer": "^4.3.2",
@@ -95,8 +95,8 @@
9595
"prettier": "^2.5.1",
9696
"pretty-quick": "^3.1.3",
9797
"rimraf": "^3.0.2",
98-
"sass": "^1.55.0",
99-
"stylelint": "^14.14.0",
98+
"sass": "^1.56.0",
99+
"stylelint": "^14.14.1",
100100
"stylelint-config-prettier": "^9.0.3",
101101
"stylelint-config-sass-guidelines": "^9.0.1",
102102
"validate-branch-name": "^1.3.0",
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
<input type="radio" class="elm-radio {{ styleModifier }}"{{#if name}} name="{{ name }}"{{/if }} id="{{ id }}"{{#if checked}} checked{{/if }}{{#if disabled}} disabled{{/if }} value="{{ value }}"{{#if describedbyid }} aria-describedby="{{ describedbyid }}"{{/if }}>
1+
<input type="radio"
2+
class="elm-radio {{ styleModifier }}"{{#if name}} name="{{ name }}"{{/if }}
3+
id="{{ id }}"
4+
{{#if checked}} checked{{/if }}
5+
{{#if disabled}} disabled{{/if }}
6+
value="{{ value }}"
7+
{{#if describedbyid }} aria-describedby="{{ describedbyid }}"{{/if }}
8+
{{#if invalid}}aria-invalid="true"{{/if }}>
29
<label class="elm-label" for="{{ id }}">{{ label }}</label>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "radio06",
2+
"id": "radio04",
33
"checked": true,
44
"disabled": true
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"id": "radio05",
2+
"id": "radio03",
33
"disabled": true
44
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"id": "radio05",
3+
"invalid": true
4+
}

source/_patterns/02-components/language-switcher/language-switcher.scss

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,23 @@
3434

3535
// TODO: This is an enhancement for more languages, but obviously doesn't scale that nicely and would need some rework
3636
&:not([aria-selected="true"]) ~ li:not([aria-selected="true"]) {
37-
top: to-rem($pxValue: 108);
37+
top: to-rem($pxValue: 54 * 2);
38+
39+
& ~ li:not([aria-selected="true"]) {
40+
top: to-rem($pxValue: 54 * 3);
41+
42+
& ~ li:not([aria-selected="true"]) {
43+
top: to-rem($pxValue: 54 * 4);
44+
45+
& ~ li:not([aria-selected="true"]) {
46+
top: to-rem($pxValue: 54 * 5);
47+
48+
& ~ li:not([aria-selected="true"]) {
49+
top: to-rem($pxValue: 54 * 6);
50+
}
51+
}
52+
}
53+
}
3854
}
3955
@media screen and (min-width: 1024px) {
4056
top: to-rem($pxValue: 56);

source/css/_db-ui-core.variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* *****
2+
This file summarizes the general variables relevant for using DB UI Core with SCSS.
3+
***** */
4+
15
// Define the path for both image and font folders
26
$icons-path: "../../icons/" !default;
37
$images-path: "../../images/" !default;

source/css/_fonts.general.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* *****
2+
SCSS placeholder for general font declarations
3+
***** */
4+
15
@import "db-ui-core.variables";
26

37
%general-fonts {

source/css/db-ui-core.general.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/* *****
2+
This is mainly meant to get included within scoped components like e.g. within StencilJS Custom Components / DB UI Elements
3+
***** */
4+
15
@import "db-ui-core.variables";
26
@import "@csstools/normalize.css/normalize";
37
@import "../_patterns/00-base/init";

source/css/db-ui-core.vars.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/* *****
2+
This file is meant to get included globally on a page with a standard set of variables and font references,
3+
if you're using only partials – either Web Components out of DB UI Elements or the partial CSS generated out
4+
of DB UI Core for each element and component.
5+
***** */
6+
17
// Define the path for both image and font folders
28
$icons-path: "../icons/" !default;
39
$images-path: "../images/" !default;
@@ -12,6 +18,7 @@ $fonts-path: "../fonts/" !default;
1218
@import "../_patterns/00-base/icons/icons.font-faces";
1319

1420
:root {
21+
// Overwriting the referenced SVG icons as this is going to get inlined and the path would be relative to the pages URL instead of the CSS, which would break
1522
--db-ic-search-24: url(#{$icons-path}functional/images/action/db_ic_search_24.svg);
1623
--db-ic-expand-more-20: url(#{$icons-path}functional/images/navigation/db_ic_expand_more_20.svg);
1724
}

0 commit comments

Comments
 (0)