Skip to content

Commit

Permalink
chore: migrate develop branch (#3361)
Browse files Browse the repository at this point in the history
* fix(theme): add support for halved values in spacing (#3237)

Co-authored-by: Sujit Pradhan <sujit.pradhan@logmein.com>

* docs: format backticks in titles

* docs: update command to run before changeset

* fix: remove typo

Co-authored-by: Sujit Pradhan <psujit14@gmail.com>
Co-authored-by: Sujit Pradhan <sujit.pradhan@logmein.com>
Co-authored-by: Jozef Mikuláš <jmikulas.sk@gmail.com>
  • Loading branch information
4 people committed Feb 11, 2021
1 parent 8fdca9b commit 8597f58
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .changeset/three-beers-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@chakra-ui/theme": patch
"@chakra-ui/react": patch
---

Allow halved values in design token in Spacing as mentioned in the documents
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ https://www.conventionalcommits.org/ or check out the
4. Run `yarn changeset` to create a detailed description of your changes. This
will be used to generate a changelog when we publish an update.
[Learn more about Changeset](https://github.com/atlassian/changesets/tree/master/packages/cli).
Please note that you might have to run `git fetch origin master:master`
Please note that you might have to run `git fetch origin main:master`
(where origin will be your fork on GitHub) before `yarn changeset` works.

> If you made minor changes like CI config, prettier, etc, you can run
Expand Down
4 changes: 4 additions & 0 deletions packages/theme/src/foundations/spacing.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
export const spacing = {
px: "1px",
0: "0",
0.5: "0.125rem",
1: "0.25rem",
1.5: "0.375rem",
2: "0.5rem",
2.5: "0.625rem",
3: "0.75rem",
3.5: "0.875rem",
4: "1rem",
5: "1.25rem",
6: "1.5rem",
Expand Down

1 comment on commit 8597f58

@vercel
Copy link

@vercel vercel bot commented on 8597f58 Feb 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.