Skip to content

Commit

Permalink
Merge branch 'master' into presentational-password-input
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan committed May 13, 2019
2 parents e475bfb + e71825a commit a6fab25
Show file tree
Hide file tree
Showing 420 changed files with 8,179 additions and 3,455 deletions.
12 changes: 8 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
command: yarn install --offline --frozen-lockfile
- run:
name: Build packages
command: yarn build
command: yarn lerna run build --scope=carbon-components --include-filtered-dependencies
- run:
name: Run Continuous Integration checks
command: yarn lerna run ci-check --scope carbon-components
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
command: yarn install --offline --frozen-lockfile
- run:
name: Build packages
command: yarn build
command: yarn lerna run build --scope=carbon-components-react --include-filtered-dependencies
- run:
name: Run Continuous Integration checks
command: yarn lerna run ci-check --scope carbon-components-react
Expand All @@ -74,14 +74,18 @@ jobs:
if [ "${CIRCLE_BRANCH}" == "master" ]; then
# Install `ibmcloud` CLI
curl -fsSL https://clis.ng.bluemix.net/install/linux | sh
# Login and push staging manifest
ibmcloud login \
--apikey $CLOUD_API_KEY \
-a https://api.ng.bluemix.net \
-o carbon-design-system \
-s production
-o carbon-design-system
ibmcloud target -s production
ibmcloud cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
ibmcloud cf install-plugin blue-green-deploy -f -r CF-Community
# Default storybook build
cd packages/react
yarn build-storybook
Expand Down
58 changes: 43 additions & 15 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,62 @@
## Carbon Code of Conduct

This is a place to ask questions, work through any challenges, and share ideas and best practices. The following suggestions and guidelines are intended to make the community easier and more enjoyable to use.
This is a place to ask questions, work through any challenges, and share ideas
and best practices. The following suggestions and guidelines are intended to
make the community easier and more enjoyable to use.

### TLDR;

- **Be respectful & understanding.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior or poor manners. It is important that we resolve disagreements and differing views constructively.
- **Be respectful & understanding.** Not all of us will agree all the time, but
disagreement is no excuse for poor behavior or poor manners. It is important
that we resolve disagreements and differing views constructively.

* **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities.
* **Be welcoming.** We strive to be a community that welcomes and supports
people of all backgrounds and identities.

### General

Communication through any of Carbon's channels (GitHub, emails, Twitter, Slack) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
Communication through any of Carbon's channels (GitHub, emails, Twitter, Slack)
must be constructive and never resort to personal attacks, trolling, public or
private harassment, insults, or other unprofessional conduct.

We promise to extend courtesy and respect to everyone involved in this project, regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to Carbon to do the same.
We promise to extend courtesy and respect to everyone involved in this project,
regardless of gender, gender identity, sexual orientation, disability, age,
race, ethnicity, religion, or level of experience. We expect anyone contributing
to Carbon to do the same.

If any member of the community violates this Code of Conduct, the maintainers of Carbon may take action, including removing issues, comments, and PRs or blocking accounts, as deemed appropriate.
If any member of the community violates this Code of Conduct, the maintainers of
Carbon may take action, including removing issues, comments, and PRs or blocking
accounts, as deemed appropriate.

If you are subjected to or witness unacceptable behavior, or have any other concerns, please communicate with us directly via carbon@us.ibm.com.
If you are subjected to or witness unacceptable behavior, or have any other
concerns, please communicate with us directly via carbon@us.ibm.com.

### Slack

1. Please, no `@here` or `@channel` unless it is a bug that is **breaking production code.** We have communities in many different time zones, and we would hate to disrupt someone not at the office.
2. There's no need to notify the Carbon team that you have made an issue in Carbon's GitHub repositories. We check these several times a day, so we promise we'll address your issue as soon as we can.
3. Reserve direct messages for sensitive discussions, such as privacy, legal, or HR reasons. Otherwise, we encourage posting in public channels so people with the same questions can benefit.
4. If you have a pressing bug fix, it is best to make a PR directly to get your issues addressed.
5. `#carbon-components`: This channel is for questions about Carbon Components only. It is not the place to ask general coding questions. Instead, use a dev community like [StackOverflow](https://stackoverflow.com/).
6. `#carbon-design-system`: Please post any design questions with an in-context screen shot (i.e. screen shot of the whole UI you are designing) with background as to what you are trying to accomplish in this flow. We welcome in-progress work to get community design feedback as well.
1. Please, no `@here` or `@channel` unless it is a bug that is **breaking
production code.** We have communities in many different time zones, and we
would hate to disrupt someone not at the office.
2. There's no need to notify the Carbon team that you have made an issue in
Carbon's GitHub repositories. We check these several times a day, so we
promise we'll address your issue as soon as we can.
3. Reserve direct messages for sensitive discussions, such as privacy, legal,
or HR reasons. Otherwise, we encourage posting in public channels so people
with the same questions can benefit.
4. If you have a pressing bug fix, it is best to make a PR directly to get your
issues addressed.
5. `#carbon-components`: This channel is for questions about Carbon Components
only. It is not the place to ask general coding questions. Instead, use a
dev community like [StackOverflow](https://stackoverflow.com/).
6. `#carbon-design-system`: Please post any design questions with an in-context
screen shot (i.e. screen shot of the whole UI you are designing) with
background as to what you are trying to accomplish in this flow. We welcome
in-progress work to get community design feedback as well.

<hr>

If you have suggestions to improve this Code of Conduct, please submit an issue or PR.
If you have suggestions to improve this Code of Conduct, please submit an issue
or PR.

This Code of Conduct was adopted from the [Angular Project](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md) and [Todo Open Code of Conduct](http://todogroup.org/opencodeofconduct/).
This Code of Conduct was adopted from the
[Angular Project](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md)
and [Todo Open Code of Conduct](http://todogroup.org/opencodeofconduct/).
3 changes: 2 additions & 1 deletion .github/COMPONENT_DOCS_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

#### Mixins

Mixins specific to { THIS_COMPONENT_NAME } are located in [src/components/{ COMPONENT }/\_mixins.scss]().
Mixins specific to { THIS_COMPONENT_NAME } are located in
[src/components/{ COMPONENT }/\_mixins.scss]().

| Name | Params | Description |
| ---------- | ----------------- | ----------- |
Expand Down
Loading

0 comments on commit a6fab25

Please sign in to comment.