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

Commit

Permalink
Master to main (#55)
Browse files Browse the repository at this point in the history
* master -> main

* change log
  • Loading branch information
mjhenkes authored Jul 6, 2020
1 parent 21cd3a1 commit 0bfdf02
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
branches:
only:
- master
- main
cache:
directories:
- $HOME/docker
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
github_token: $GITHUB_TOKEN # Set in travis-ci.com dashboard
local_dir: build
on:
branch: master
branch: main
- stage: clean up cache
before_install: true
script:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Unreleased
----------
### Changed
* Corrected typo in `.gitignore` file.
* Updated Docs to point to main branch for terra-toolkit-boneyard.

1.27.0 - (June 23, 2020)
------------------
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Thanks.
## Issue Reporting

* Please browse our [existing issues][1] before logging new issues.
* Check that the issue has not already been fixed in the `master` branch.
* Check that the issue has not already been fixed in the `main` branch.
* Open an issue with a descriptive title and a summary.
* Please be as clear and explicit as you can in your description of the problem.
* Please state the version of Operating System, Browser, and terra-toolkit you are using in the description.
Expand All @@ -30,7 +30,7 @@ Thanks.
* The pull request will be reviewed by the community and merged by the project committers.

## Project Governance
* This project is maintained and goverend following the [terra governance document](https://github.com/cerner/terra-ui/blob/master/GOVERNANCE.md).
* This project is maintained and goverend following the [terra governance document](https://github.com/cerner/terra-ui/blob/main/GOVERNANCE.md).

[1]: https://github.com/cerner/terra-application/issues
[2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Logo -->
<p align="center">
<img height="128" width="128" src="https://github.com/cerner/terra-application/raw/master/terra.png" alt="terra logo" />
<img height="128" width="128" src="https://github.com/cerner/terra-application/raw/main/terra.png" alt="terra logo" />
</p>

<!-- Name -->
Expand All @@ -10,7 +10,7 @@

[![NPM version](https://badgen.net/npm/v/terra-application)](https://www.npmjs.org/package/terra-application)
[![Cerner OSS](https://badgen.net/badge/Cerner/OSS/blue)](http://engineering.cerner.com/2014/01/cerner-and-open-source/)
[![License](https://badgen.net/github/license/cerner/terra-application)](https://github.com/cerner/terra-application/blob/master/LICENSE)
[![License](https://badgen.net/github/license/cerner/terra-application)](https://github.com/cerner/terra-application/blob/main/LICENSE)
[![Build Status](https://badgen.net/travis/cerner/terra-application)](https://travis-ci.com/cerner/terra-application)
[![Dependencies status](https://badgen.net/david/dep/cerner/terra-application)](https://david-dm.org/cerner/terra-application)
[![devDependencies status](https://badgen.net/david/dev/cerner/terra-application)](https://david-dm.org/cerner/terra-application?type=dev)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ApplicationBase exposes props to define the application's theme.

ApplicationBase renders a theme context provider around its children. Children can access the current theme by using the [ThemeContext](/application/terra-application/contexts/theme-context).

<!-- Consumers of ApplicationBase should review Terra's [theme aggregation](https://github.com/cerner/terra-toolkit-boneyard/blob/master/scripts/aggregate-themes/README.md) instructions to ensure the all theme properties are loaded appropriately. -->
<!-- Consumers of ApplicationBase should review Terra's [theme aggregation](https://github.com/cerner/terra-toolkit-boneyard/blob/main/scripts/aggregate-themes/README.md) instructions to ensure the all theme properties are loaded appropriately. -->

### Breakpoints

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ Due to the large number of Context-based APIs provided by `terra-application`, t

Packages that define `terra-application` within their `dependencies` out of necessity must take extra precaution to ensure that only a single version of `terra-application` is installed. The [DuplicatePackageCheckerPlugin](https://github.com/cerner/duplicate-package-checker-webpack-plugin) should be used to detect duplicated packages at build time.

> The DuplicatePackageCheckerPlugin is included in `terra-toolkit`'s provided [webpack configuration](https://github.com/cerner/terra-toolkit-boneyard/blob/master/docs/Webpack.md).
> The DuplicatePackageCheckerPlugin is included in `terra-toolkit`'s provided [webpack configuration](https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Webpack.md).
4 changes: 2 additions & 2 deletions src/terra-dev-site/guide/theme-strategy.guide.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ The recommended file structure looks like this:

## Webpack

To enable themes a `terra-theme.config.js` configuration file must be defined. This file is read by the [terra-toolkit postcss loader](https://github.com/cerner/terra-toolkit-boneyard/tree/master/config/webpack/postcss) to apply default themes. The loader runs automatically for webpack configurations using [terra-toolkit's webpack config](https://github.com/cerner/terra-toolkit-boneyard/blob/master/config/webpack/webpack.config.js).
To enable themes a `terra-theme.config.js` configuration file must be defined. This file is read by the [terra-toolkit postcss loader](https://github.com/cerner/terra-toolkit-boneyard/tree/main/config/webpack/postcss) to apply default themes. The loader runs automatically for webpack configurations using [terra-toolkit's webpack config](https://github.com/cerner/terra-toolkit-boneyard/blob/main/config/webpack/webpack.config.js).

```js
const themeConfig = {
Expand Down Expand Up @@ -130,7 +130,7 @@ Themes testing can be enabled via the CLI using `--themes`.
}
```

See the [WDIO documentation](https://github.com/cerner/terra-toolkit-boneyard/tree/master/scripts/wdio#terra-toolkit-wdio-helpers) for additional configuration options.
See the [WDIO documentation](https://github.com/cerner/terra-toolkit-boneyard/tree/main/scripts/wdio#terra-toolkit-wdio-helpers) for additional configuration options.

## FAQ

Expand Down

0 comments on commit 0bfdf02

Please sign in to comment.