Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into refactor/file-selecto…
Browse files Browse the repository at this point in the history
…r-variants
  • Loading branch information
DavideMininni-Fincons committed Nov 21, 2024
2 parents fcc995f + dd8d644 commit 8ecf666
Show file tree
Hide file tree
Showing 89 changed files with 4,114 additions and 2,260 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/continuous-integration-secure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ jobs:
docker push $IMAGE_REPO_PREVIEW:pr$PR_NUMBER
env:
DOCKER_BUILDKIT: 1
- name: Build slim image
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_PREVIEW }}:pr${{ env.PR_NUMBER }}'
tag: 'pr${{ env.PR_NUMBER }}-slim'
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Push slim image
run: |
docker push $IMAGE_REPO_PREVIEW:pr$PR_NUMBER-slim
docker image list
- name: "Add 'preview-available' label"
# This label is used for filtering deployments in ArgoCD
Expand Down Expand Up @@ -181,6 +192,18 @@ jobs:
docker push $IMAGE_REPO_VISUAL_REGRESSION:pr$PR_NUMBER
env:
DOCKER_BUILDKIT: 1
- name: Build slim image
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:pr${{ env.PR_NUMBER }}'
tag: 'pr${{ env.PR_NUMBER }}-slim'
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Push slim image
run: |
docker push $IMAGE_REPO_VISUAL_REGRESSION:pr$PR_NUMBER-slim
docker image list
- name: Apply labels
if: steps.screenshot-check.outputs.result == 'changed' || steps.screenshot-check.outputs.result == 'empty'
run: |
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,14 @@ jobs:
docker push $IMAGE_REPO_VISUAL_REGRESSION:baseline
env:
DOCKER_BUILDKIT: 1
- name: Build slim image
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:baseline'
tag: baseline-slim
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Push slim image
run: |
docker push $IMAGE_REPO_VISUAL_REGRESSION:baseline-slim
docker image list
35 changes: 35 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,47 @@ jobs:
env:
DOCKER_BUILDKIT: 1
VERSION: ${{ steps.release.outputs.version }}
- name: Build slim image with version
if: ${{ steps.release.outputs.release_created }}
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_STORYBOOK }}:${{ steps.release.outputs.version }}'
tag: '${{ steps.release.outputs.version }}-slim'
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Build slim image with latest
if: ${{ steps.release.outputs.release_created }}
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_STORYBOOK }}:latest'
tag: latest-slim
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Push slim image
if: ${{ steps.release.outputs.release_created }}
run: |
docker push $IMAGE_REPO_STORYBOOK:$VERSION-slim
docker push $IMAGE_REPO_STORYBOOK:latest-slim
docker image list
env:
VERSION: ${{ steps.release.outputs.version }}
- name: 'Container: Build and publish dev image'
run: |
docker build --tag $IMAGE_REPO_STORYBOOK:dev .
docker push $IMAGE_REPO_STORYBOOK:dev
env:
DOCKER_BUILDKIT: 1
- name: Build slim image with dev
uses: kitabisa/docker-slim-action@v1
with:
target: '${{ env.IMAGE_REPO_STORYBOOK }}:dev'
tag: dev-slim
env:
DSLIM_PRESERVE_PATH: /usr/share/nginx/html
- name: Push slim image
run: |
docker push $IMAGE_REPO_STORYBOOK:dev-slim
docker image list
- name: Cherry-pick CHANGELOG.md into ${{ github.event.repository.default_branch }}
if: ${{ steps.release.outputs.release_created && github.ref_name != 'main' }}
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
"lit": "3.2.1"
},
"devDependencies": {
"@commitlint/cli": "19.5.0",
"@commitlint/config-conventional": "19.5.0",
"@commitlint/cli": "19.6.0",
"@commitlint/config-conventional": "19.6.0",
"@custom-elements-manifest/analyzer": "0.10.3",
"@custom-elements-manifest/to-markdown": "0.1.0",
"@eslint/eslintrc": "3.2.0",
Expand All @@ -84,21 +84,21 @@
"@open-wc/lit-helpers": "0.7.0",
"@open-wc/testing": "4.0.0",
"@sbb-esta/lyne-design-tokens": "1.3.0",
"@storybook/addon-a11y": "8.4.4",
"@storybook/addon-actions": "8.4.4",
"@storybook/addon-essentials": "8.4.4",
"@storybook/addon-interactions": "8.4.4",
"@storybook/addon-links": "8.4.4",
"@storybook/blocks": "8.4.4",
"@storybook/manager-api": "8.4.4",
"@storybook/preview-api": "8.4.4",
"@storybook/test": "8.4.4",
"@storybook/theming": "8.4.4",
"@storybook/types": "8.4.4",
"@storybook/web-components": "8.4.4",
"@storybook/web-components-vite": "8.4.4",
"@storybook/addon-a11y": "8.4.5",
"@storybook/addon-actions": "8.4.5",
"@storybook/addon-essentials": "8.4.5",
"@storybook/addon-interactions": "8.4.5",
"@storybook/addon-links": "8.4.5",
"@storybook/blocks": "8.4.5",
"@storybook/manager-api": "8.4.5",
"@storybook/preview-api": "8.4.5",
"@storybook/test": "8.4.5",
"@storybook/theming": "8.4.5",
"@storybook/types": "8.4.5",
"@storybook/web-components": "8.4.5",
"@storybook/web-components-vite": "8.4.5",
"@types/glob": "8.1.0",
"@types/mocha": "10.0.9",
"@types/mocha": "10.0.10",
"@types/node": "20.17.6",
"@types/react": "18.3.12",
"@typescript-eslint/eslint-plugin": "8.15.0",
Expand All @@ -114,10 +114,10 @@
"eslint": "9.15.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.3",
"eslint-plugin-import-x": "4.4.2",
"eslint-plugin-import-x": "4.4.3",
"eslint-plugin-lit": "1.15.0",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-storybook": "0.11.0",
"eslint-plugin-storybook": "0.11.1",
"eslint-plugin-yml": "1.15.0",
"glob": "11.0.0",
"globals": "15.12.0",
Expand All @@ -134,11 +134,11 @@
"rollup-plugin-postcss-lit": "2.1.0",
"sass": "1.81.0",
"sinon": "19.0.2",
"storybook": "8.4.4",
"storybook": "8.4.5",
"stylelint": "16.10.0",
"stylelint-config-prettier-scss": "1.0.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-scss": "6.9.0",
"stylelint-scss": "6.10.0",
"ts-lit-plugin": "2.0.2",
"tslib": "2.8.1",
"typescript": "5.6.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["sbb-autocomplete-grid Safari DOM"] =
`<sbb-autocomplete-grid
data-state="closed"
id="sbb-autocomplete-grid-1"
role="grid"
>
snapshots["sbb-autocomplete-grid Chrome-Firefox DOM"] =
`<sbb-autocomplete-grid data-state="closed">
<sbb-autocomplete-grid-row
id="sbb-autocomplete-grid-row-1"
role="row"
Expand Down Expand Up @@ -55,9 +51,9 @@ snapshots["sbb-autocomplete-grid Safari DOM"] =
</sbb-autocomplete-grid-row>
</sbb-autocomplete-grid>
`;
/* end snapshot sbb-autocomplete-grid Safari DOM */
/* end snapshot sbb-autocomplete-grid Chrome-Firefox DOM */

snapshots["sbb-autocomplete-grid Safari Shadow DOM"] =
snapshots["sbb-autocomplete-grid Chrome-Firefox Shadow DOM"] =
`<div class="sbb-autocomplete__gap-fix">
</div>
<div class="sbb-autocomplete__container">
Expand All @@ -79,18 +75,26 @@ snapshots["sbb-autocomplete-grid Safari Shadow DOM"] =
</div>
<div class="sbb-autocomplete__panel">
<div class="sbb-autocomplete__wrapper">
<div class="sbb-autocomplete__options">
<div
class="sbb-autocomplete__options"
id="sbb-autocomplete-grid-2"
role="grid"
>
<slot>
</slot>
</div>
</div>
</div>
</div>
`;
/* end snapshot sbb-autocomplete-grid Safari Shadow DOM */
/* end snapshot sbb-autocomplete-grid Chrome-Firefox Shadow DOM */

snapshots["sbb-autocomplete-grid Chrome-Firefox DOM"] =
`<sbb-autocomplete-grid data-state="closed">
snapshots["sbb-autocomplete-grid Safari DOM"] =
`<sbb-autocomplete-grid
data-state="closed"
id="sbb-autocomplete-grid-1"
role="grid"
>
<sbb-autocomplete-grid-row
id="sbb-autocomplete-grid-row-1"
role="row"
Expand Down Expand Up @@ -139,9 +143,9 @@ snapshots["sbb-autocomplete-grid Chrome-Firefox DOM"] =
</sbb-autocomplete-grid-row>
</sbb-autocomplete-grid>
`;
/* end snapshot sbb-autocomplete-grid Chrome-Firefox DOM */
/* end snapshot sbb-autocomplete-grid Safari DOM */

snapshots["sbb-autocomplete-grid Chrome-Firefox Shadow DOM"] =
snapshots["sbb-autocomplete-grid Safari Shadow DOM"] =
`<div class="sbb-autocomplete__gap-fix">
</div>
<div class="sbb-autocomplete__container">
Expand All @@ -163,28 +167,24 @@ snapshots["sbb-autocomplete-grid Chrome-Firefox Shadow DOM"] =
</div>
<div class="sbb-autocomplete__panel">
<div class="sbb-autocomplete__wrapper">
<div
class="sbb-autocomplete__options"
id="sbb-autocomplete-grid-2"
role="grid"
>
<div class="sbb-autocomplete__options">
<slot>
</slot>
</div>
</div>
</div>
</div>
`;
/* end snapshot sbb-autocomplete-grid Chrome-Firefox Shadow DOM */
/* end snapshot sbb-autocomplete-grid Safari Shadow DOM */

snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Chrome"] =
snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Firefox"] =
`<p>
{
"role": "WebArea",
"role": "document",
"name": "",
"children": [
{
"role": "text",
"role": "statictext",
"name": "​"
},
{
Expand All @@ -197,16 +197,16 @@ snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Chrome"] =
}
</p>
`;
/* end snapshot sbb-autocomplete-grid Chrome-Firefox A11y tree Chrome */
/* end snapshot sbb-autocomplete-grid Chrome-Firefox A11y tree Firefox */

snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Firefox"] =
snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Chrome"] =
`<p>
{
"role": "document",
"role": "WebArea",
"name": "",
"children": [
{
"role": "statictext",
"role": "text",
"name": "​"
},
{
Expand All @@ -219,5 +219,5 @@ snapshots["sbb-autocomplete-grid Chrome-Firefox A11y tree Firefox"] =
}
</p>
`;
/* end snapshot sbb-autocomplete-grid Chrome-Firefox A11y tree Firefox */
/* end snapshot sbb-autocomplete-grid Chrome-Firefox A11y tree Chrome */

4 changes: 2 additions & 2 deletions src/elements/card/card-badge/readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The `sbb-card-badge` can contain some information like prices or discounts,
and can be used in [sbb-card](/docs/components-sbb-card-sbb-card--docs) or
[sbb-selection-expansion-panel](/docs/components-sbb-selection-expansion-panel--docs).
and can be used in [sbb-card](/docs/elements-sbb-card-sbb-card--docs) or
[sbb-selection-expansion-panel](/docs/elements-sbb-selection-expansion-panel--docs).

To achieve the correct spacing between elements inside the card badge, we recommend to use `span`-elements.
All content parts are presented with a predefined gap in between.
Expand Down
Loading

0 comments on commit 8ecf666

Please sign in to comment.