Skip to content

Commit

Permalink
Merge branch 'main' into fix-folder-name
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Nov 19, 2024
2 parents fb10cfd + 13155a0 commit 20d7284
Show file tree
Hide file tree
Showing 26 changed files with 728 additions and 1,558 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
[
angular17-example,
react-example,
react-tailwind-template,
vue-example,
]
steps:
Expand All @@ -49,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build-examples]
container:
image: mcr.microsoft.com/playwright:v1.32.3-focal
image: mcr.microsoft.com/playwright:v1.49.0
steps:
- name: ⬇ Checkout repo
uses: actions/checkout@v4
Expand All @@ -66,12 +65,6 @@ jobs:
name: react-example
path: ./build/react-example

- name: ⬇ Download build react-tailwind
uses: actions/download-artifact@v4
with:
name: react-tailwind-template
path: ./build/react-tailwind-template

- name: ⬇ Download build vue
uses: actions/download-artifact@v4
with:
Expand Down
26 changes: 13 additions & 13 deletions angular17-example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion angular17-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@angular/platform-browser": "^17.3.0",
"@angular/platform-browser-dynamic": "^17.3.0",
"@angular/router": "^17.3.0",
"@db-ui/ngx-components": "^0.3.3",
"@db-ui/ngx-components": "^0.5.7",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3"
Expand Down
6 changes: 3 additions & 3 deletions angular17-example/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
>
<h1>db-ui-functional</h1>
<p>Use this as default for enterprise apps</p>
<db-button icon="user">Test</db-button>
<db-button icon="person">Test</db-button>
</div>
<div
data-density="regular"
class="db-successful-bg-basic-level-1 container-with-padding"
>
<h1>db-ui-regular</h1>
<p>Use this as default for consumer apps</p>
<db-button icon="user">Test</db-button>
<db-button icon="person">Test</db-button>
</div>
<div
data-density="expressive"
class="db-successful-bg-basic-level-2 container-with-padding"
>
<h1>db-ui-expressive</h1>
<p>Use this as default for marketing apps</p>
<db-button icon="user">Test</db-button>
<db-button icon="person">Test</db-button>
</div>
</main>
2 changes: 0 additions & 2 deletions angular17-example/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
@forward "@db-ui/components/build/styles/db-ui-42-rollup";
// We use $db-spacing-fixed-md variable so we need to import the file where the variable is defined
@use "@db-ui/foundations/build/scss/variables";
// Color-classes are optional, we use them in the example to have easy access to colors
@forward "@db-ui/foundations/build/css/colors/classes/all";

.container-with-padding {
padding: variables.$db-spacing-fixed-md;
Expand Down
2 changes: 1 addition & 1 deletion e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/playwright:v1.32.3-focal as playwright
FROM mcr.microsoft.com/playwright:v1.49.0 as playwright

COPY e2e /e2e
COPY build/ build/
Expand Down
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.
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

0 comments on commit 20d7284

Please sign in to comment.