Skip to content

Commit

Permalink
Merge branch 'main' into 2134-button-group-do-not-have-focus-style-fo…
Browse files Browse the repository at this point in the history
…r-checkboxradio-variants
  • Loading branch information
davidritter-dotcom authored Nov 14, 2023
2 parents bec58d9 + 895bd5b commit aa46e74
Show file tree
Hide file tree
Showing 59 changed files with 1,083 additions and 399 deletions.
6 changes: 0 additions & 6 deletions .changeset/clean-dancers-film.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fuzzy-forks-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-teachers-shout.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/gorgeous-clouds-trade.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/gorgeous-gorillas-confess.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/mighty-crews-thank.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/neat-maps-give.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/tricky-tables-warn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@swisspost/design-system-documentation': minor
---

Added a documentation page for the `.container` and `.container-fluid` classes.
5 changes: 0 additions & 5 deletions .changeset/wet-lions-fly.md

This file was deleted.

7 changes: 7 additions & 0 deletions packages/components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @swisspost/design-system-components-react

## 1.0.22

### Patch Changes

- Updated dependencies:
- @swisspost/design-system-components@1.6.2

## 1.0.21

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swisspost/design-system-components-react",
"version": "1.0.21",
"version": "1.0.22",
"license": "Apache-2.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -19,7 +19,7 @@
"tsc": "tsc -p ."
},
"dependencies": {
"@swisspost/design-system-components": "workspace:1.6.1"
"@swisspost/design-system-components": "workspace:1.6.2"
},
"devDependencies": {
"@types/node": "18.18.8",
Expand Down
7 changes: 7 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @swisspost/design-system-components

## 1.6.2

### Patch Changes

- Updated dependencies:
- @swisspost/design-system-styles@6.4.4

## 1.6.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swisspost/design-system-components",
"version": "1.6.1",
"version": "1.6.2",
"description": "A collection of web components built with Stencil JS for the Swiss Post Design System.",
"license": "Apache-2.0",
"main": "loader/index.cjs.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"@floating-ui/dom": "1.5.3",
"@oddbird/popover-polyfill": "0.3.1",
"@stencil/core": "4.7.0",
"@swisspost/design-system-styles": "workspace:6.4.3",
"@swisspost/design-system-styles": "workspace:6.4.4",
"ally.js": "1.4.1",
"long-press-event": "2.4.6"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/demo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @swisspost/design-system-demo

## 7.0.4

### Patch Changes

- Updated dependencies:
- @swisspost/design-system-styles@6.4.4
- @swisspost/design-system-intranet-header@5.0.4

## 7.0.3

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swisspost/design-system-demo",
"version": "7.0.3",
"version": "7.0.4",
"description": "Pattern documentation, code snippets and implementation guidelines for the Design System Styles.",
"author": "Swiss Post <[email protected]>",
"license": "Apache-2.0",
Expand All @@ -25,8 +25,8 @@
"@ng-bootstrap/ng-bootstrap": "15.1.2",
"@popperjs/core": "2.11.8",
"@swimlane/ngx-datatable": "20.1.0",
"@swisspost/design-system-intranet-header": "workspace:5.0.3",
"@swisspost/design-system-styles": "workspace:6.4.3",
"@swisspost/design-system-intranet-header": "workspace:5.0.4",
"@swisspost/design-system-styles": "workspace:6.4.4",
"bootstrap": "5.3.2",
"core-js": "3.33.2",
"highlight.js": "11.9.0",
Expand Down
73 changes: 70 additions & 3 deletions packages/demo/src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,81 @@ <h4 class="alert-heading">The Swiss Post Design System is now compatible with An
rel="noopener"
target="_blank"
>
Support chanel
Support channel
</a>
in Teams.
</p>
</div>
<section>
<h3>Compatibility</h3>

<section class="migration-options mb-huge">
<div class="row">
<p id="compatibility-desc">List of compatible version numbers with external dependencies.</p>

<div class="row gx-5 mt-4">
<div class="col-md-6 col-sm-12 table-responsive">
<h4>Styles</h4>
<table aria-describedby="compatibility-desc" class="table caption-top">
<caption>Package @swisspost/design-system-styles</caption>
<thead>
<tr>
<th scope="col">Version</th>
<th scope="col">Bootstrap</th>
<th scope="col">Angular</th>
<th scope="col">Ng-Bootstrap</th>
</tr>
</thead>

<tbody>
<tr>
<th scope="col">5.x</th>
<td>5.0</td>
<td>14.x</td>
<td>13.x</td>
</tr>
<tr>
<th scope="col">6.2</th>
<td>5.2</td>
<td>15.x</td>
<td>14.x</td>
</tr>
<tr>
<th scope="col">6.4</th>
<td>5.3</td>
<td>16.x</td>
<td>15.x</td>
</tr>
</tbody>
</table>
</div>
<div class="col-md-6 col-sm-12 table-responsive">
<h4>Common Web Frontend</h4>
<table aria-describedby="compatibility-desc" class="table caption-top">
<caption>Package @ch-post-common/common-web-frontend</caption>
<thead>
<tr>
<th scope="col">Version</th>
<th scope="col">Bootstrap</th>
<th scope="col">Angular</th>
<th scope="col">Ng-Bootstrap</th>
</tr>
</thead>

<tbody>
<tr>
<th scope="col">4.x</th>
<td>4.6</td>
<td>12.x</td>
<td>9.x</td>
</tr>
</tbody>
</table>
</div>
</div>
</section>

<section>
<h3>Setup for migration instructions</h3>
<div class="row migration-options mb-huge">
<div class="col-md-6">
<fieldset>
<legend class="font-curve-small bold">What environment is your application for?</legend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,40 @@ <h2 class="bold">Installation</h2>
<a href="https://angular.io/">Angular</a>
component and as such, only works with Angular projects.
</p>
<p id="version-support">The supported Angular versions are:</p>
<table aria-describedby="version-support" class="table table-sm w-auto mb-regular-r">
<thead>
<tr>
<th scope="col" class="pe-regular">Intranet Header</th>
<th scope="col">Angular</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">4.x</th>
<td>15.x</td>
</tr>
<tr>
<th scope="row">5.x</th>
<td>16.x</td>
</tr>
</tbody>
</table>
<div class="table-responsive">
<table class="table caption-top mb-regular-r">
<caption>List of compatible version numbers with external dependencies.</caption>
<thead>
<tr>
<th scope="col">Intranet-header</th>
<th scope="col">Bootstrap</th>
<th scope="col">Angular</th>
<th scope="col">Ng-Bootstrap</th>
</tr>
</thead>

<tbody>
<tr>
<th scope="row">3.x</th>
<td>4.x</td>
<td>14.x</td>
<td>13.x</td>
</tr>
<tr>
<th scope="row">4.x</th>
<td>5.2</td>
<td>15.x</td>
<td>14.x</td>
</tr>
<tr>
<th scope="row">5.x</th>
<td>5.2</td>
<td>16.x</td>
<td>15.x</td>
</tr>
</tbody>
</table>
</div>
<p>Install the latest version of the Intranet Header with:</p>
<code
class="block mb-regular-r bash"
Expand Down
4 changes: 2 additions & 2 deletions packages/documentation/.storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const preview: Preview = {
order: [
'Home',
'Getting Started',
['Styles', 'Components'],
['Styles', 'Components', 'Compatibility'],
'Foundations',
[
'Typography',
'Color',
'Layout',
['Breakpoints', 'Grid', 'Column', 'TODOS'],
['Breakpoints', 'Containers', 'Grid', 'TODOS'],
'Elevation',
'Accessibility',
],
Expand Down
17 changes: 17 additions & 0 deletions packages/documentation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# @swisspost/design-system-documentation

## 2.4.0

### Minor Changes

- Added docs page on how to use columns. (by [@davidritter-dotcom](https://github.com/davidritter-dotcom) with [#2062](https://github.com/swisspost/design-system/pull/2062))

### Patch Changes

- Added official way to use label in a floating-label select as a placeholder. (by [@imagoiq](https://github.com/imagoiq) with [#2200](https://github.com/swisspost/design-system/pull/2200))

- Extended the `@swisspost/design-system-components` package getting-started docs page to show multiple ways how it can be used/imported in different project setups. (by [@oliverschuerch](https://github.com/oliverschuerch) with [#2214](https://github.com/swisspost/design-system/pull/2214))
- Updated dependencies:
- @swisspost/internet-header@1.13.0
- @swisspost/design-system-styles@6.4.4
- @swisspost/design-system-components@1.6.2
- @swisspost/design-system-components-react@1.0.22

## 2.3.1

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ describe('Select', () => {
multiple.forEach(multiple => {
it(multiple, () => {
cy.visit(`${SELECTBASEURL}${multiple}`);
cy.get('.form-select', { timeout: 30000 }).should('be.visible');
cy.percySnapshot(`Selects-${multiple}`, { widths: [400] });
});
});

});
});
10 changes: 5 additions & 5 deletions packages/documentation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swisspost/design-system-documentation",
"version": "2.3.1",
"version": "2.4.0",
"description": "Swiss Post Design System Documentation.",
"author": "Swiss Post <[email protected]>",
"license": "Apache-2.0",
Expand All @@ -25,11 +25,11 @@
"snapshots": "percy exec -- cypress run --config-file ./cypress.snapshot.config.js --record --key 0995e768-43ec-42bd-a127-ff944a2ad8c9"
},
"dependencies": {
"@swisspost/design-system-components": "workspace:1.6.1",
"@swisspost/design-system-components-react": "workspace:1.0.21",
"@swisspost/design-system-components": "workspace:1.6.2",
"@swisspost/design-system-components-react": "workspace:1.0.22",
"@swisspost/design-system-icons": "workspace:1.0.14",
"@swisspost/design-system-styles": "workspace:6.4.3",
"@swisspost/internet-header": "workspace:1.12.1",
"@swisspost/design-system-styles": "workspace:6.4.4",
"@swisspost/internet-header": "workspace:1.13.0",
"bootstrap": "5.3.2"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { Canvas, Controls, Meta } from '@storybook/blocks';
import * as TopicTeaserStories from './topic-teaser.stories';
import StylesPackageImport from '../../../shared/styles-package-import.mdx';
import './topic-teaser.styles.scss';

<Meta of={TopicTeaserStories} />

<div className="hide-col-default container">

# Topic Teaser

<div className="lead">
Expand All @@ -13,9 +16,14 @@ import StylesPackageImport from '../../../shared/styles-package-import.mdx';

If you use multiple topic teasers on one page, each topic teaser must have a different background.

<Canvas sourceState="shown" of={TopicTeaserStories.Default} />
<div className="hide-col-default">
</div>

<Canvas className="topic-teaser-full-width-storybook" of={TopicTeaserStories.Default} />

<div className="hide-col-default container">
<Controls of={TopicTeaserStories.Default} />
</div>

<StylesPackageImport components={["topic-teaser"]} />
<div className="hide-col-default container">
<StylesPackageImport components={['topic-teaser']} />
</div>
Loading

0 comments on commit aa46e74

Please sign in to comment.