Skip to content
This repository has been archived by the owner on Jan 2, 2024. It is now read-only.

Commit

Permalink
Merge 5ebee37 into 54ef313
Browse files Browse the repository at this point in the history
  • Loading branch information
rpearce committed Mar 13, 2019
2 parents 54ef313 + 5ebee37 commit 3950d6b
Show file tree
Hide file tree
Showing 14 changed files with 5,673 additions and 4,183 deletions.
26 changes: 25 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "react-with-responsive",
"projectOwner": "rpearce",
"projectOwner": "articulate",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand All @@ -9,6 +9,30 @@
"imageSize": 100,
"commit": true,
"contributors": [
{
"login": "mgreystone",
"name": "Markus Greystone",
"avatar_url": "https://avatars2.githubusercontent.com/u/12430681?v=4",
"profile": "https://github.com/mgreystone",
"contributions": [
"code",
"ideas",
"test",
"review"
]
},
{
"login": "jsilve",
"name": "Jillian Silver",
"avatar_url": "https://avatars2.githubusercontent.com/u/5667054?v=4",
"profile": "https://github.com/jsilve",
"contributions": [
"code",
"ideas",
"test",
"review"
]
},
{
"login": "rpearce",
"name": "Robert Pearce",
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Articulate Global, Inc. <engineering@articulate.com> (https://articulate.com)
Markus Greystone <mgreystone@articulate.com> (https://github.com/mgreystone)
Jillian Silver <silverjillian@gmail.com> (https://github.com/jsilve)
Robert Pearce <me@robertwpearce.com> (https://robertwpearce.com)
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Contributing

1. Check out the [issues](https://github.com/rpearce/react-with-responsive/issues)
1. Check out the [issues](https://github.com/articulate/react-with-responsive/issues)
1. [Fork](https://guides.github.com/activities/forking/) this repository
1. [Clone](https://help.github.com/articles/cloning-a-repository/) your fork
1. Add the upstream project (this one) as a git remote:
```
$ git remote add upstream git@github.com:rpearce/react-with-responsive.git
$ git remote add upstream git@github.com:articulate/react-with-responsive.git
$ git fetch upstream
$ git rebase upstream/master
```
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ISC License (ISC)

Copyright 2019 Robert Pearce
Copyright 2019 Articulate Global, Inc.

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# react-with-responsive
[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors)
[![npm version](https://img.shields.io/npm/v/react-with-responsive.svg)](https://www.npmjs.com/package/react-with-responsive) [![npm downloads](https://img.shields.io/npm/dt/react-with-responsive.svg)](https://www.npmjs.com/package/react-with-responsive) [![Build Status](https://travis-ci.org/rpearce/react-with-responsive.svg?branch=master)](https://travis-ci.org/rpearce/react-with-responsive) [![Coverage Status](https://coveralls.io/repos/github/rpearce/react-with-responsive/badge.svg?branch=master)](https://coveralls.io/github/rpearce/react-with-responsive?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/8e4debef4b9f0e8acd6e/maintainability)](https://codeclimate.com/github/rpearce/react-with-responsive/maintainability)
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors)
[![npm version](https://img.shields.io/npm/v/react-with-responsive.svg)](https://www.npmjs.com/package/react-with-responsive) [![npm downloads](https://img.shields.io/npm/dt/react-with-responsive.svg)](https://www.npmjs.com/package/react-with-responsive) [![Build Status](https://travis-ci.org/articulate/react-with-responsive.svg?branch=master)](https://travis-ci.org/articulate/react-with-responsive) [![Coverage Status](https://coveralls.io/repos/github/articulate/react-with-responsive/badge.svg?branch=master)](https://coveralls.io/github/articulate/react-with-responsive?branch=master)

## Links
* [`API Documentation`](./API.md)
Expand All @@ -15,8 +15,8 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
| [<img src="https://avatars2.githubusercontent.com/u/592876?v=4" width="100px;"/><br /><sub><b>Robert Pearce</b></sub>](https://robertwpearce.com)<br />[💻](https://github.com/rpearce/react-with-responsive/commits?author=rpearce "Code") [📖](https://github.com/rpearce/react-with-responsive/commits?author=rpearce "Documentation") [💡](#example-rpearce "Examples") [🤔](#ideas-rpearce "Ideas, Planning, & Feedback") [⚠️](https://github.com/rpearce/react-with-responsive/commits?author=rpearce "Tests") |
| :---: |
<table><tr><td align="center"><a href="https://github.com/mgreystone"><img src="https://avatars2.githubusercontent.com/u/12430681?v=4" width="100px;" alt="Markus Greystone"/><br /><sub><b>Markus Greystone</b></sub></a><br /><a href="https://github.com/articulate/react-with-responsive/commits?author=mgreystone" title="Code">💻</a> <a href="#ideas-mgreystone" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/articulate/react-with-responsive/commits?author=mgreystone" title="Tests">⚠️</a> <a href="#review-mgreystone" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://github.com/jsilve"><img src="https://avatars2.githubusercontent.com/u/5667054?v=4" width="100px;" alt="Jillian Silver"/><br /><sub><b>Jillian Silver</b></sub></a><br /><a href="https://github.com/articulate/react-with-responsive/commits?author=jsilve" title="Code">💻</a> <a href="#ideas-jsilve" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/articulate/react-with-responsive/commits?author=jsilve" title="Tests">⚠️</a> <a href="#review-jsilve" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://robertwpearce.com"><img src="https://avatars2.githubusercontent.com/u/592876?v=4" width="100px;" alt="Robert Pearce"/><br /><sub><b>Robert Pearce</b></sub></a><br /><a href="https://github.com/articulate/react-with-responsive/commits?author=rpearce" title="Code">💻</a> <a href="https://github.com/articulate/react-with-responsive/commits?author=rpearce" title="Documentation">📖</a> <a href="#example-rpearce" title="Examples">💡</a> <a href="#ideas-rpearce" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/articulate/react-with-responsive/commits?author=rpearce" title="Tests">⚠️</a></td></tr></table>

<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

0 comments on commit 3950d6b

Please sign in to comment.