Skip to content

Commit b88517c

Browse files
mfranzkemfranzke
committed
Merge branch 'main' into dbux-3
2 parents c5738fc + 5cbe9f4 commit b88517c

File tree

10 files changed

+176
-67
lines changed

10 files changed

+176
-67
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "daily"
8+
time: "03:00"
9+
timezone: "Europe/Berlin"
810
pull-request-branch-name:
911
separator: "-"
12+
reviewers:
13+
- "github-actions"
1014

1115
# Daily: Check minor and patch updates
1216
- package-ecosystem: "npm"
1317
directory: "/"
1418
open-pull-requests-limit: 10
1519
schedule:
1620
interval: "daily"
21+
time: "03:00"
22+
timezone: "Europe/Berlin"
1723
pull-request-branch-name:
1824
separator: "-"
1925
# https://github.com/dependabot/dependabot-core/issues/5226#issuecomment-1179434437
2026
versioning-strategy: increase
27+
reviewers:
28+
- "github-actions"

‎.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.16.4
20+
uses: trufflesecurity/trufflehog@v3.17.0
2121
with:
2222
path: ./
2323
base: ${{ steps.extract_branch.outputs.branch-name }}

‎.github/workflows/01-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: 🔄 Init Cache
1515
uses: ./.github/actions/npm-cache
1616

17-
- name: ⚡ Run Test
17+
- name: ⚡ Run Lint
1818
run: npm run lint
1919

2020
- name: 💀 Killing me softly

‎.stylelintrc.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@
44
"stylelint-config-prettier"
55
],
66
"rules": {
7+
"selector-no-qualifying-type": null,
8+
"selector-class-pattern": null,
9+
"scss/dollar-variable-pattern": null,
10+
"scss/selector-no-redundant-nesting-selector": null,
711
"max-nesting-depth": null,
8-
"order/order": null
12+
"selector-max-compound-selectors": null,
13+
"scss/at-extend-no-missing-placeholder": null,
14+
"declaration-property-value-disallowed-list": null,
15+
"scss/percent-placeholder-pattern": null,
16+
"scss/at-mixin-pattern": null,
17+
"order/properties-alphabetical-order": null
918
}
1019
}

‎package-lock.json‎

Lines changed: 23 additions & 23 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
@@ -60,7 +60,7 @@
6060
"pretty-quick": "3.1.3",
6161
"sass": "^1.56.1",
6262
"style-dictionary": "3.7.1",
63-
"stylelint": "14.14.1",
63+
"stylelint": "14.15.0",
6464
"stylelint-config-prettier": "9.0.4",
6565
"stylelint-config-sass-guidelines": "9.0.1",
6666
"validate-branch-name": "^1.3.0",

‎source/_patterns/icons/_icons.demonstration.scss‎

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

33
.DO-NOT-COPY-THIS-CLASS-example-icon-list {
44
&,
5-
ul {
5+
ol {
66
list-style: none;
77

88
padding-left: 0;
@@ -18,18 +18,74 @@
1818
min-width: 250px;
1919
}
2020
.DO-NOT-COPY-THIS-CLASS-example-bg-variants-regular {
21-
ul {
21+
ol {
2222
justify-content: flex-end;
2323
}
2424
}
2525
}
2626

27+
details {
28+
summary {
29+
cursor: pointer;
30+
31+
display: flex;
32+
flex-direction: column;
33+
align-items: center;
34+
35+
// Remove existing marker
36+
&::-webkit-details-marker {
37+
display: none;
38+
}
39+
// … and using some other declaration for Mozilla Firefox
40+
&:first-of-type {
41+
list-style-type: none;
42+
}
43+
44+
figure {
45+
text-align: center;
46+
}
47+
}
48+
49+
ul {
50+
li {
51+
display: list-item;
52+
padding: initial;
53+
}
54+
}
55+
56+
// Icon details
57+
aside {
58+
position: fixed;
59+
left: 50%;
60+
top: 50%;
61+
transform: translate(-50%, -50%);
62+
z-index: 10;
63+
64+
background-color: #fff;
65+
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
66+
67+
padding: 1rem;
68+
}
69+
70+
// Achieving a full viewport clickarea for closing the overflow menu
71+
&[open] summary::after {
72+
content: "\00A0";
73+
display: inline-block;
74+
height: 100vh;
75+
left: 0;
76+
position: fixed;
77+
top: 0;
78+
width: 100vw;
79+
z-index: 5;
80+
}
81+
}
82+
2783
& > li {
2884
display: flex;
2985
}
3086

31-
&.icons {
32-
ul {
87+
&:where(.icons) {
88+
ol {
3389
color: $db-colors-secondary-enabled;
3490
}
3591

@@ -70,7 +126,7 @@
70126
}
71127
}
72128
&.functional {
73-
ul {
129+
ol {
74130
display: flex;
75131
align-items: center;
76132
}

‎source/_patterns/icons/functional/functional-icons.hbs‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,49 @@
1-
<ul class="DO-NOT-COPY-THIS-CLASS-example-icon-list icons functional">
1+
{{#unless icons}}<p>Please keep in mind that it's optional to set the variant combination of size ({{ icon-size }}) and style ({{ icon-style }}) as these are defined as default.<br>In case that you'll need another default in your project, you could overwrite the defaults by overwriting the <code>$icon-size</code> and <code>$icon-style</code> SCSS variables.</p>{{/unless }}
2+
<ol class="DO-NOT-COPY-THIS-CLASS-example-icon-list icons functional">
23
{{#each icons }}<li>
3-
<ul>
4-
{{#each @root.example-bgs }}
5-
<li class="DO-NOT-COPY-THIS-CLASS-example-bg-variants-{{ variant }}">
6-
<ul>
7-
{{#each ../variants }}
8-
{{#if_eq @root.category "transportation"}}
9-
<li>
10-
<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" aria-hidden="true">
11-
<use href="../../icons/functional/images/{{ @root.category }}/{{#if style}}{{style}}{{else}}regular{{/if }}/db_ic_{{ ../../icon }}{{#if style }}_{{ style }}{{/if }}_{{ size }}.svg#icon"></use>
12-
</svg>
13-
</li>
14-
{{else}}
15-
<li>
16-
<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" aria-hidden="true">
17-
<use href="../../icons/functional/images/{{ @root.category }}/db_ic_{{ ../../icon }}{{#if style }}_{{ style }}{{/if }}_{{ size }}.svg#icon"></use>
18-
</svg>
19-
</li>
20-
{{/if_eq}}
21-
{{/each }}
22-
</ul>
23-
</li>
24-
{{/each }}
25-
</ul>
4+
<details>
5+
<summary>
6+
<figure>
7+
{{#if_eq @root.category "transportation"}}
8+
<svg xmlns="http://www.w3.org/2000/svg" width="{{ @root.icon-size }}" height="{{ @root.icon-size }}" aria-hidden="true">
9+
<use href="../../icons/functional/images/{{ @root.category }}/{{#if style}}{{style}}{{else}}regular{{/if }}/db_ic_{{ icon }}{{#if style }}_{{ style }}{{/if }}_20.svg#icon"></use>
10+
</svg>
11+
{{else}}
12+
<svg xmlns="http://www.w3.org/2000/svg" width="{{ @root.icon-size }}" height="{{ @root.icon-size }}" aria-hidden="true">
13+
<use href="../../icons/functional/images/{{ @root.category }}/db_ic_{{ icon }}{{#if style }}_{{ style }}{{/if }}_20.svg#icon"></use>
14+
</svg>
15+
{{/if_eq}}
16+
<figcaption>{{ icon }}{{#if style }}_{{ style }}{{/if }}</figcaption>
17+
</figure>
18+
</summary>
19+
<aside>
20+
<ol>
21+
{{#each @root.example-bgs }}
22+
<li class="DO-NOT-COPY-THIS-CLASS-example-bg-variants-{{ variant }}">
23+
<ol>
24+
{{#each ../variants }}
25+
{{#if_eq @root.category "transportation"}}
26+
<li>
27+
<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" aria-hidden="true">
28+
<use href="../../icons/functional/images/{{ @root.category }}/{{#if style}}{{style}}{{else}}regular{{/if }}/db_ic_{{ ../../icon }}{{#if style }}_{{ style }}{{/if }}_{{ size }}.svg#icon"></use>
29+
</svg>
30+
</li>
31+
{{else}}
32+
<li>
33+
<svg xmlns="http://www.w3.org/2000/svg" width="{{ size }}" height="{{ size }}" aria-hidden="true">
34+
<use href="../../icons/functional/images/{{ @root.category }}/db_ic_{{ ../../icon }}{{#if style }}_{{ style }}{{/if }}_{{ size }}.svg#icon"></use>
35+
</svg>
36+
</li>
37+
{{/if_eq}}
38+
{{/each }}
39+
</ol>
40+
</li>
41+
{{/each }}
42+
</ol>
43+
<ul>
44+
<li>SCSS: <code>@include icon(glyph({{ icon }}))</code></li>
45+
<li>HTML: <code>data-icon="{{ icon }}"</code></li>
46+
</ul>
47+
</aside>
2648
</li>{{/each }}
27-
</ul>
49+
</ol>

‎source/_patterns/icons/functional/functional-icons.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
{
77
"variant": "dark"
88
}
9-
]
9+
],
10+
"icon-size": "24",
11+
"icon-style": "outline"
1012
}

0 commit comments

Comments
 (0)