Skip to content

Commit

Permalink
fix: rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
benjitrosch committed Mar 12, 2022
1 parent 4d3b9d3 commit a6d60ac
Show file tree
Hide file tree
Showing 36 changed files with 461 additions and 45 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: '16.x'
registry-url: 'https://npm.pkg.github.com/'
if: ${{ steps.release.outputs.release_created }}
- run: npm ci
if: ${{ steps.release.outputs.release_created }}
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
if: ${{ steps.release.outputs.release_created }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist
dist-ssr
*.local
.history
.env
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
registry=https://registry.npmjs.org/
always-auth=true
Empty file added CHANGELOG.md
Empty file.
27 changes: 10 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![NPM Version](https://img.shields.io/npm/v/react-daisyui.svg?branch=master)](https://www.npmjs.com/package/react-daisyui) [![npm bundle size](https://img.shields.io/bundlephobia/minzip/react-daisyui)](https://bundlephobia.com/result?p=react-daisyui) [![License](https://img.shields.io/npm/l/react-daisyui.svg)](https://github.com/daisyui/react-daisyui/blob/master/LICENSE)
[![NPM Version](https://img.shields.io/npm/v/react-daisyui.svg?branch=master)](https://www.npmjs.com/package/react-daisyui) [![npm bundle size](https://img.shields.io/bundlephobia/minzip/react-daisyui)](https://bundlephobia.com/result?p=react-daisyui) [![License](https://img.shields.io/npm/l/react-daisyui.svg)](https://github.com/daisyui/react-daisyui/blob/master/LICENSE)

# react-daisyui 🌼

Expand Down Expand Up @@ -41,11 +41,7 @@ Import react-daisyui components within your component files:
import { Button } from 'react-daisyui'

export default (props) => {
return (
<Button color="primary">
Click me!
</Button>
)
return <Button color="primary">Click me!</Button>
}
```

Expand All @@ -60,15 +56,11 @@ export default (props) => {
return (
<>
<Theme dataTheme="dark">
<Button color="primary">
Click me, dark!
</Button>
<Button color="primary">Click me, dark!</Button>
</Theme>

<Theme dataTheme="light">
<Button color="primary">
Click me, light!
</Button>
<Button color="primary">Click me, light!</Button>
</Theme>
</>
)
Expand Down Expand Up @@ -151,9 +143,9 @@ Use tools like the official <a href="https://daisyui.com/theme-generator/">daisy
<details>
<summary>Mockup:</summary>

- [ ] <a href="https://react.daisyui.com/?path=/story/mockup-code">Code</a>
- [ ] <a href="https://react.daisyui.com/?path=/story/mockup-phone">Phone</a>
- [ ] <a href="https://react.daisyui.com/?path=/story/mockup-window">Window</a>
- [X] <a href="https://react.daisyui.com/?path=/story/mockup-code">Code</a>
- [X] <a href="https://react.daisyui.com/?path=/story/mockup-phone">Phone</a>
- [X] <a href="https://react.daisyui.com/?path=/story/mockup-window">Window</a>
</details>

---
Expand All @@ -169,7 +161,8 @@ For story references, check out the official <a href="https://daisyui.com/compon
Run `npm run generate component ${your_new_component_name}`. The generator will ask a few questions and setup the component for you.

When you'e done, export the component from `index.tsx` and open a PR.
___

---

### License

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -347,4 +347,4 @@



window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.a4acde4e.iframe.bundle.js"></script><script src="vendors~main.9e2892dd.iframe.bundle.js"></script><script src="main.f544c610.iframe.bundle.js"></script></body></html>
window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.fce714ab.iframe.bundle.js"></script><script src="vendors~main.bb0c588d.iframe.bundle.js"></script><script src="main.7d8f58f4.iframe.bundle.js"></script></body></html>
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@



window['DOCS_MODE'] = false;</script><script src="runtime~main.546ba506561d1235ba15.manager.bundle.js"></script><script src="vendors~main.e6e41e56691972459789.manager.bundle.js"></script><script src="main.a6182f76894686f3c25a.manager.bundle.js"></script></body></html>
window['DOCS_MODE'] = false;</script><script src="runtime~main.5a3231c17bd16a24990b.manager.bundle.js"></script><script src="vendors~main.e6e41e56691972459789.manager.bundle.js"></script><script src="main.97521131e99c2f8ad184.manager.bundle.js"></script></body></html>
1 change: 1 addition & 0 deletions docs/main.7d8f58f4.iframe.bundle.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/main.f544c610.iframe.bundle.js

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a6d60ac

Please sign in to comment.