Skip to content

Commit

Permalink
Merge branch 'release/v1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
erictompkins committed May 12, 2022
2 parents 0ca839d + 0c62f2b commit afac522
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ npm version <update_type>

`<update_type>` could be one of `patch`, `minor`, `major`, `prepatch`, `preminor`, `premajor`, `prerelease`.

Then finish the release branch and push the `develop` and `main` branch to GitHub.
Then finish the release branch. **Don't tag the release branch because `npm version` already did that.** Push the `develop` and `main` branch to GitHub.

Then [publish the package to NPM](https://docs.npmjs.com/cli/publish).

Expand Down
10 changes: 0 additions & 10 deletions generators/app/templates/src/css/base/typography.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@ html {
font-size: 62.5%;
}

/**
* Scale down text on small screens
*/

@media (--c-bp-sm) {
html {
font-size: 56.25%;
}
}

/**
* Set body defaults for other elements to inherit
*/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-cacao-branchcms",
"version": "1.7.1",
"version": "1.8.0",
"description": "Generator to use Cacao with a BranchCMS website",
"homepage": "",
"author": {
Expand Down

0 comments on commit afac522

Please sign in to comment.