Skip to content

Commit

Permalink
Merge branch 'main' into contentlayer2
Browse files Browse the repository at this point in the history
  • Loading branch information
sebald committed May 21, 2024
2 parents 0c9f35b + 2687b4d commit de45223
Show file tree
Hide file tree
Showing 25 changed files with 87 additions and 40 deletions.
5 changes: 0 additions & 5 deletions .changeset/brave-maps-itch.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/empty-tips-perform.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hip-coats-retire.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-pillows-exist.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/swift-days-retire.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: pnpm release:notification --packages '${{ steps.changesets.outputs.publishedPackages }}'
- name: Slack Notification
if: steps.changesets.outputs.published == 'true'
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v1.26.0
with:
payload-file-path: './slack-notification.json'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
- name: Run Test Coverage
run: pnpm test:ci
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
9 changes: 9 additions & 0 deletions config/storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @marigold/storybook-config

## 1.1.40

### Patch Changes

- Updated dependencies [[`3e448ed`](https://github.com/marigold-ui/marigold/commit/3e448ede593cc4e4070366a1e6ac1ac8870dc102), [`bdd23ec`](https://github.com/marigold-ui/marigold/commit/bdd23ec48895543b9a4bd3d925c47dd02da8aefd), [`f0c0bc1`](https://github.com/marigold-ui/marigold/commit/f0c0bc18b0ad22984ad344e99222a7119c47ed36)]:
- @marigold/theme-core@26.1.8
- @marigold/theme-b2b@27.1.8
- @marigold/components@7.7.2

## 1.1.39

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion config/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/storybook-config",
"description": "Marigold's storybook configuration",
"version": "1.1.39",
"version": "1.1.40",
"license": "MIT",
"exports": "./main.js",
"keywords": [
Expand Down
15 changes: 15 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @marigold/docs

## 7.7.2

### Patch Changes

- [#3908](https://github.com/marigold-ui/marigold/pull/3908) [`20fb4f4`](https://github.com/marigold-ui/marigold/commit/20fb4f4868747b3a965688aebe48f3247d397d57) Thanks [@OsamaAbdellateef](https://github.com/OsamaAbdellateef)! - Fixing icons into docs to be copied in the right way

- [#3865](https://github.com/marigold-ui/marigold/pull/3865) [`5eafe50`](https://github.com/marigold-ui/marigold/commit/5eafe50e4f03ab782b6dcb03bed82ec9b9460fc2) Thanks [@OsamaAbdellateef](https://github.com/OsamaAbdellateef)! - [DST-379]: Docs: The selected theme on marigold docs is now persisted in the local storage.

- Updated dependencies [[`3e448ed`](https://github.com/marigold-ui/marigold/commit/3e448ede593cc4e4070366a1e6ac1ac8870dc102), [`bdd23ec`](https://github.com/marigold-ui/marigold/commit/bdd23ec48895543b9a4bd3d925c47dd02da8aefd), [`f0c0bc1`](https://github.com/marigold-ui/marigold/commit/f0c0bc18b0ad22984ad344e99222a7119c47ed36)]:
- @marigold/theme-core@26.1.8
- @marigold/theme-b2b@27.1.8
- @marigold/components@7.7.2
- @marigold/icons@1.2.48
- @marigold/theme-preset@1.3.13

## 7.7.1

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions docs/content/introduction/get-in-touch.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ order: 5
badge: new
---

We receive many questions and inquiries regarding Marigold and our design system, and we're here to help. Whether you're stuck or seeking information, our aim is to support you every step of the way.
We receive many questions and inquiries regarding Marigold and our design system,and we're here to help. Whether you're stuck or seeking information, our aim is to support you every step of the way.

Before reaching out, we kindly ask you to check our existing documentation. Exploring our website might already provide the solution you need. It's a great resource to help you with a lot of issues you might encounter.

If you can't find what you're looking for there, don't hesitate to get in touch.

<Message messageTitle="Most importantly!" variant="info">
If there's anything else on your mind, please don't hesitate to reach out to
us via Slack or drop by our office. We're committed to being here for you
whenever you need assistance!
If there's anything on your mind, please don't hesitate to reach out to us or
drop by our office. We're committed to being here for you whenever you need
assistance!
</Message>

## General Questions
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/docs",
"version": "7.7.1",
"version": "7.7.2",
"private": true,
"scripts": {
"dev": "pnpm registry && next dev",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"engines": {
"node": "20.x"
},
"packageManager": "pnpm@9.0.6",
"packageManager": "pnpm@9.1.0",
"dependencies": {
"@babel/core": "7.24.4",
"@changesets/changelog-github": "0.5.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @marigold/components

## 7.7.2

### Patch Changes

- Updated dependencies []:
- @marigold/system@7.7.2
- @marigold/icons@1.2.48

## 7.7.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/components",
"version": "7.7.1",
"version": "7.7.2",
"description": "Components for the Marigold Design System",
"license": "MIT",
"keywords": [
Expand Down
7 changes: 7 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @marigold/icons

## 1.2.48

### Patch Changes

- Updated dependencies []:
- @marigold/system@7.7.2

## 1.2.47

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@marigold/icons",
"description": "Marigold Icons",
"version": "1.2.47",
"version": "1.2.48",
"license": "MIT",
"keywords": [
"marigold",
Expand Down
2 changes: 2 additions & 0 deletions packages/system/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @marigold/system

## 7.7.2

## 7.7.1

## 7.7.0
Expand Down
2 changes: 1 addition & 1 deletion packages/system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/system",
"version": "7.7.1",
"version": "7.7.2",
"description": "Marigold System Library",
"license": "MIT",
"keywords": [
Expand Down
7 changes: 7 additions & 0 deletions packages/theme-preset/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @marigold/theme-preset

## 1.3.13

### Patch Changes

- Updated dependencies []:
- @marigold/system@7.7.2

## 1.3.12

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-preset/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/theme-preset",
"version": "1.3.12",
"version": "1.3.13",
"description": "Create a tailwind Preset for Marigold",
"license": "MIT",
"keywords": [
Expand Down
11 changes: 11 additions & 0 deletions themes/theme-b2b/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @marigold/theme-b2b

## 27.1.8

### Patch Changes

- [#3889](https://github.com/marigold-ui/marigold/pull/3889) [`f0c0bc1`](https://github.com/marigold-ui/marigold/commit/f0c0bc18b0ad22984ad344e99222a7119c47ed36) Thanks [@sebald](https://github.com/sebald)! - refa(DSTSUP-73): Improve elevation (more distinguisable)

- Updated dependencies []:
- @marigold/system@7.7.2
- @marigold/components@7.7.2
- @marigold/theme-preset@1.3.13

## 27.1.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion themes/theme-b2b/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/theme-b2b",
"version": "27.1.7",
"version": "27.1.8",
"description": "Marigold B2B Theme",
"license": "MIT",
"keywords": [
Expand Down
13 changes: 13 additions & 0 deletions themes/theme-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @marigold/theme-core

## 26.1.8

### Patch Changes

- [#3904](https://github.com/marigold-ui/marigold/pull/3904) [`3e448ed`](https://github.com/marigold-ui/marigold/commit/3e448ede593cc4e4070366a1e6ac1ac8870dc102) Thanks [@sebald](https://github.com/sebald)! - fix(core-theme): adjust disabled color for `input`

- [#3907](https://github.com/marigold-ui/marigold/pull/3907) [`bdd23ec`](https://github.com/marigold-ui/marigold/commit/bdd23ec48895543b9a4bd3d925c47dd02da8aefd) Thanks [@sebald](https://github.com/sebald)! - refa: remove css scoping

- Updated dependencies []:
- @marigold/system@7.7.2
- @marigold/components@7.7.2
- @marigold/theme-preset@1.3.13

## 26.1.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion themes/theme-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marigold/theme-core",
"version": "26.1.7",
"version": "26.1.8",
"description": "Marigold Core Theme",
"license": "MIT",
"keywords": [
Expand Down

0 comments on commit de45223

Please sign in to comment.