Skip to content

Commit 2fa543a

Browse files
gesquincaMikeLockz
authored andcommitted
merge latest development (#221)
* Update issue templates Adding Bug Report and Feature Request templates. * Create pull_request_template.md * Ml adding lint rules (#190) * Adding precommit lint hook. * Formatting all existing source files. * Updating failing test snapshots from reformatted source files. * add table component (#193) * styled Table component * updated story and example * remove merged cells from example * updated table header styles * update example of merged cells * updated Text componen to use theme values * Updating Table component tests and snapshots. * Adding code of conduct and contribution guideline documents. (#192) * Adding code of conduct and contribution guideline documents. * Adding contributions as MIT. * Adding link to license. * Update CODE_OF_CONDUCT.md * WIP: Rewriting component attribute props from objects to functions. Broke storybook. * Updating the component test app with all HTML5 input types. * Updating failing snapshot tests. * Updating snapshot tests. Upgraded testing packages and styled-component packages to latest. * Fixing bad package version. * update packages * version bump * upgrade storybook * use react@16.8.4 for storybook
1 parent fd40f38 commit 2fa543a

98 files changed

Lines changed: 3852 additions & 2509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Fixes #
2+
3+
Changes proposed in the Pull Request:
4+
-
5+
-
6+
-

.prettierrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
'singleQuote': true,
3+
'trailingComma': 'es5',
4+
}
File renamed without changes.

docs/CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at zach.kalman@consensys.net. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

docs/CONTRIBUTIONS.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
Contributing to Rimble UI
2+
=========================================
3+
4+
When contributing, please follow the [Code of Conduct](CODE_OF_CONDUCT.md).
5+
6+
Issues
7+
------
8+
9+
Feel free to submit issues and enhancement requests.
10+
11+
Contributing
12+
------------
13+
14+
We follow the "fork-and-pull" Git workflow.
15+
16+
1. **Fork** the repo on GitHub
17+
2. **Clone** the project to your own machine
18+
3. **Commit** changes to your own branch
19+
4. **Push** your work back up to your fork
20+
5. Submit a **Pull request** and we will review your changes
21+
22+
Copyright and Licensing
23+
-----------------------
24+
25+
All contributions to this codebase will be under the MIT License.
26+
27+
MIT License
28+
29+
Copyright (c) 2018-2019 ConsenSys
30+
31+
[View the full license](./../LICENSE.txt)
32+
Permission is hereby granted, free of charge, to any person obtaining a copy
33+
of this software and associated documentation files (the "Software"), to deal
34+
in the Software without restriction, including without limitation the rights
35+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
36+
copies of the Software, and to permit persons to whom the Software is
37+
furnished to do so, subject to the following conditions:
38+
39+
The above copyright notice and this permission notice shall be included in all
40+
copies or substantial portions of the Software.
41+
42+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
43+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
45+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
46+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
47+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
48+
SOFTWARE.

example/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"private": true,
77
"dependencies": {
88
"prop-types": "^15.7.2",
9-
"react": "^16.8.4",
10-
"react-dom": "^16.8.4",
9+
"react": "16.8.4",
10+
"react-dom": "^16.8.5",
1111
"react-scripts": "^2.1.8",
1212
"rimble-ui": "link:.."
1313
},
@@ -21,16 +21,16 @@
2121
"deploy-storybook": "storybook-to-ghpages"
2222
},
2323
"devDependencies": {
24-
"@babel/core": "^7.3.4",
25-
"@storybook/addon-a11y": "^5.0.1",
26-
"@storybook/addon-actions": "^5.0.1",
27-
"@storybook/addon-links": "^5.0.1",
28-
"@storybook/addon-viewport": "^5.0.1",
29-
"@storybook/addons": "^5.0.1",
30-
"@storybook/react": "^5.0.1",
24+
"@babel/core": "^7.4.0",
25+
"@storybook/addon-a11y": "^5.0.5",
26+
"@storybook/addon-actions": "^5.0.5",
27+
"@storybook/addon-links": "^5.0.5",
28+
"@storybook/addon-viewport": "^5.0.5",
29+
"@storybook/addons": "^5.0.5",
30+
"@storybook/react": "^5.0.5",
3131
"@storybook/storybook-deployer": "^2.8.1",
3232
"babel-loader": "^8.0.5",
3333
"storybook-addon-styled-component-theme": "^1.1.1",
34-
"storybook-readme": "^4.0.5"
34+
"storybook-readme": "^5.0.1"
3535
}
3636
}

0 commit comments

Comments
 (0)