Skip to content

Commit

Permalink
Merge branch 'main' into badge-size
Browse files Browse the repository at this point in the history
  • Loading branch information
cf-remylenoir committed Dec 6, 2023
2 parents f7a42cd + 66b900f commit 91245d3
Show file tree
Hide file tree
Showing 72 changed files with 466 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .changelogrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{"**F36 Button** `v4.55.1`":["- fix(Button): default padding for small size\n"]}
9 changes: 9 additions & 0 deletions packages/components/accordion/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies []:
- @contentful/f36-collapse@4.55.1
- @contentful/f36-core@4.55.1
- @contentful/f36-typography@4.55.1

## 4.55.0

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/components/accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentful/f36-accordion",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Accordion React Component",
"license": "MIT",
"files": [
Expand All @@ -20,11 +20,11 @@
"build": "tsup"
},
"dependencies": {
"@contentful/f36-collapse": "^4.55.0",
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-collapse": "^4.55.1",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-typography": "^4.55.0",
"@contentful/f36-typography": "^4.55.1",
"emotion": "^10.0.17"
},
"peerDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions packages/components/asset/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies []:
- @contentful/f36-core@4.55.1
- @contentful/f36-icon@4.55.1
- @contentful/f36-typography@4.55.1

## 4.55.0

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/components/asset/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@contentful/f36-asset",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Asset component",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-icon": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-icon": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-typography": "^4.55.0",
"@contentful/f36-typography": "^4.55.1",
"emotion": "^10.0.17"
},
"peerDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions packages/components/autocomplete/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies [[`bb5e913ed`](https://github.com/contentful/forma-36/commit/bb5e913ed94c2606bef9a532fcb8f46ff80cc1a3)]:
- @contentful/f36-button@4.55.1
- @contentful/f36-core@4.55.1
- @contentful/f36-forms@4.55.1
- @contentful/f36-popover@4.55.1
- @contentful/f36-skeleton@4.55.1
- @contentful/f36-typography@4.55.1

## 4.55.0

### Patch Changes
Expand Down
14 changes: 7 additions & 7 deletions packages/components/autocomplete/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "@contentful/f36-autocomplete",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Autocomplete component",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-button": "^4.55.0",
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-forms": "^4.55.0",
"@contentful/f36-button": "^4.55.1",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-forms": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-popover": "^4.55.0",
"@contentful/f36-skeleton": "^4.55.0",
"@contentful/f36-popover": "^4.55.1",
"@contentful/f36-skeleton": "^4.55.1",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-typography": "^4.55.0",
"@contentful/f36-typography": "^4.55.1",
"@contentful/f36-utils": "^4.24.2",
"downshift": "^6.1.12",
"emotion": "^10.0.17"
Expand Down
6 changes: 3 additions & 3 deletions packages/components/avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-image": "^4.0.0-alpha.0",
"@contentful/f36-menu": "^4.55.0",
"@contentful/f36-menu": "^4.55.1",
"@contentful/f36-tokens": "^4.0.0",
"@contentful/f36-tooltip": "^4.55.0",
"@contentful/f36-tooltip": "^4.55.1",
"emotion": "^10.0.17"
},
"peerDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions packages/components/badge/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies []:
- @contentful/f36-core@4.55.1

## 4.55.0

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/components/badge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentful/f36-badge",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Badge React Component",
"license": "MIT",
"files": [
Expand All @@ -20,13 +20,13 @@
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-tokens": "^4.0.2",
"emotion": "^10.0.17"
},
"devDependencies": {
"@contentful/f36-typography": "^4.55.0"
"@contentful/f36-typography": "^4.55.1"
},
"peerDependencies": {
"react": ">=16.8",
Expand Down
10 changes: 10 additions & 0 deletions packages/components/button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Change Log

## 4.55.1

### Patch Changes

- [#2626](https://github.com/contentful/forma-36/pull/2626) [`bb5e913ed`](https://github.com/contentful/forma-36/commit/bb5e913ed94c2606bef9a532fcb8f46ff80cc1a3) Thanks [@cf-remylenoir](https://github.com/cf-remylenoir)! - fix(Button): default padding for small size

- Updated dependencies []:
- @contentful/f36-core@4.55.1
- @contentful/f36-spinner@4.55.1

## 4.55.0

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/components/button/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "@contentful/f36-button",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Button component",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-spinner": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-spinner": "^4.55.1",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-utils": "^4.24.2",
"emotion": "^10.0.17"
},
"devDependencies": {
"@contentful/f36-icon": "^4.55.0",
"@contentful/f36-icon": "^4.55.1",
"@contentful/f36-icons": "^4.27.0"
},
"peerDependencies": {
Expand Down
4 changes: 3 additions & 1 deletion packages/components/button/src/Button/Button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ const sizeToStyles = (size: ButtonSize, density: Density): CSSObject => {
return {
fontSize: isHighDensity ? tokens.fontSizeS : tokens.fontSizeM,
lineHeight: tokens.lineHeightCondensed,
padding: `${tokens.spacing2Xs} ${tokens.spacingXs}`,
padding: isHighDensity
? `${tokens.spacing2Xs} ${tokens.spacingXs}`
: `${tokens.spacing2Xs} ${tokens.spacingS}`,
minHeight: isHighDensity ? '16px' : '32px',
};
case 'medium':
Expand Down
16 changes: 16 additions & 0 deletions packages/components/card/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies [[`bb5e913ed`](https://github.com/contentful/forma-36/commit/bb5e913ed94c2606bef9a532fcb8f46ff80cc1a3)]:
- @contentful/f36-button@4.55.1
- @contentful/f36-asset@4.55.1
- @contentful/f36-badge@4.55.1
- @contentful/f36-core@4.55.1
- @contentful/f36-drag-handle@4.55.1
- @contentful/f36-icon@4.55.1
- @contentful/f36-menu@4.55.1
- @contentful/f36-skeleton@4.55.1
- @contentful/f36-tooltip@4.55.1
- @contentful/f36-typography@4.55.1

## 4.55.0

### Patch Changes
Expand Down
22 changes: 11 additions & 11 deletions packages/components/card/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "@contentful/f36-card",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Card components",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-asset": "^4.55.0",
"@contentful/f36-badge": "^4.55.0",
"@contentful/f36-button": "^4.55.0",
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-drag-handle": "^4.55.0",
"@contentful/f36-icon": "^4.55.0",
"@contentful/f36-asset": "^4.55.1",
"@contentful/f36-badge": "^4.55.1",
"@contentful/f36-button": "^4.55.1",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-drag-handle": "^4.55.1",
"@contentful/f36-icon": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-menu": "^4.55.0",
"@contentful/f36-skeleton": "^4.55.0",
"@contentful/f36-menu": "^4.55.1",
"@contentful/f36-skeleton": "^4.55.1",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-tooltip": "^4.55.0",
"@contentful/f36-typography": "^4.55.0",
"@contentful/f36-tooltip": "^4.55.1",
"@contentful/f36-typography": "^4.55.1",
"emotion": "^10.0.17",
"truncate": "^3.0.0"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/components/collapse/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies []:
- @contentful/f36-core@4.55.1

## 4.55.0

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/components/collapse/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentful/f36-collapse",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Collapse React Component",
"license": "MIT",
"files": [
Expand All @@ -20,7 +20,7 @@
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-tokens": "^4.0.2",
"emotion": "^10.0.17"
},
Expand Down
9 changes: 9 additions & 0 deletions packages/components/copybutton/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 4.55.1

### Patch Changes

- Updated dependencies [[`bb5e913ed`](https://github.com/contentful/forma-36/commit/bb5e913ed94c2606bef9a532fcb8f46ff80cc1a3)]:
- @contentful/f36-button@4.55.1
- @contentful/f36-core@4.55.1
- @contentful/f36-tooltip@4.55.1

## 4.55.0

### Minor Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/components/copybutton/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@contentful/f36-copybutton",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: CopyButton component",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-button": "^4.55.0",
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-button": "^4.55.1",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-tokens": "^4.0.2",
"@contentful/f36-tooltip": "^4.55.0",
"@contentful/f36-tooltip": "^4.55.1",
"emotion": "^10.0.17"
},
"peerDependencies": {
Expand Down
11 changes: 11 additions & 0 deletions packages/components/datepicker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @contentful/f36-datepicker

## 4.55.1

### Patch Changes

- Updated dependencies [[`bb5e913ed`](https://github.com/contentful/forma-36/commit/bb5e913ed94c2606bef9a532fcb8f46ff80cc1a3)]:
- @contentful/f36-button@4.55.1
- @contentful/f36-core@4.55.1
- @contentful/f36-forms@4.55.1
- @contentful/f36-popover@4.55.1
- @contentful/f36-typography@4.55.1

## 4.55.0

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/components/datepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@contentful/f36-datepicker",
"version": "4.55.0",
"version": "4.55.1",
"description": "Forma 36: Datepicker component",
"scripts": {
"build": "tsup"
},
"dependencies": {
"@contentful/f36-core": "^4.55.0",
"@contentful/f36-typography": "^4.55.0",
"@contentful/f36-forms": "^4.55.0",
"@contentful/f36-popover": "^4.55.0",
"@contentful/f36-core": "^4.55.1",
"@contentful/f36-typography": "^4.55.1",
"@contentful/f36-forms": "^4.55.1",
"@contentful/f36-popover": "^4.55.1",
"@contentful/f36-icons": "^4.27.0",
"@contentful/f36-button": "^4.55.0",
"@contentful/f36-button": "^4.55.1",
"@contentful/f36-tokens": "^4.0.2",
"emotion": "^10.0.17",
"date-fns": "^2.28.0",
Expand Down
Loading

0 comments on commit 91245d3

Please sign in to comment.