Commit d1c2367
committed
Merge branch 'main' of github.com:db-ui/mono into feat-color-palette
# Conflicts:
# __snapshots__/badge/component/chromium/DBBadge-should-match-screenshot.png
# __snapshots__/badge/component/firefox/DBBadge-should-match-screenshot.png
# __snapshots__/badge/component/mobile-chrome/DBBadge-should-match-screenshot.png
# __snapshots__/badge/showcase/chromium/regular/neutral/DBBadge-should-match-screenshot.png
# __snapshots__/badge/showcase/firefox/regular/neutral/DBBadge-should-match-screenshot.png
# __snapshots__/badge/showcase/mobile-chrome/regular/neutral/DBBadge-should-match-screenshot.png
# __snapshots__/badge/showcase/mobile-safari/regular/neutral/DBBadge-should-match-screenshot.png
# __snapshots__/badge/showcase/webkit/regular/neutral/DBBadge-should-match-screenshot.png
# package-lock.json
# packages/foundations/package.jsonFile tree
19 files changed
+55
-43
lines changed- __snapshots__/badge
- component
- chromium
- firefox
- mobile-chrome
- showcase
- chromium/regular/neutral
- firefox/regular/neutral
- mobile-chrome/regular/neutral
- mobile-safari/regular/neutral
- webkit/regular/neutral
- output
- angular
- react
- vue
- packages/components/src/components/badge
- showcases
- angular-showcase
- patternhub
- react-showcase
- vanilla-showcase
- vue-showcase
19 files changed
+55
-43
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
0 commit comments