Skip to content

Commit

Permalink
Merge branch 'main' into 1178-brand
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke committed Jun 26, 2023
2 parents 01aeb63 + 7eba052 commit f493546
Show file tree
Hide file tree
Showing 17 changed files with 874 additions and 1,021 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion output/webcomponent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"postbuild": "npm-run-all -p mv:*"
},
"devDependencies": {
"parcel": "2.9.2"
"parcel": "2.9.3"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/",
Expand Down
1,879 changes: 866 additions & 1,013 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"test:vue-showcase": "npm run test:e2e --workspace=vue-showcase"
},
"devDependencies": {
"@commitlint/cli": "17.6.5",
"@commitlint/config-conventional": "17.6.5",
"@commitlint/cli": "17.6.6",
"@commitlint/config-conventional": "17.6.6",
"@playwright/test": "1.32.3",
"classnames": "^2.3.2",
"cpr": "3.0.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/components/brand/brand.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import classNames from 'classnames';
const DEFAULT_VALUES = {
anchorRef: '/',
src: './assets/images/db_logo.svg',
width: 57,
height: 40
width: 34,
height: 24
};

useMetadata({
Expand Down Expand Up @@ -44,13 +44,13 @@ useMetadata({
{
name: 'imgWidth',
type: 'Decimal',
defaultValue: 57,
defaultValue: 34,
displayNameKey: 'Logo Bild-Breite'
},
{
name: 'imgHeight',
type: 'Decimal',
defaultValue: 40,
defaultValue: 24,
displayNameKey: 'Logo Bild-Höhe'
}
]
Expand Down
2 changes: 1 addition & 1 deletion showcases/react-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "6.13.0"
"react-router-dom": "6.14.0"
},
"devDependencies": {
"@types/react": "^18.0.28",
Expand Down

0 comments on commit f493546

Please sign in to comment.