Skip to content

Commit

Permalink
chore: update buckram & bump version (#1178)
Browse files Browse the repository at this point in the history
  • Loading branch information
SteelWagstaff authored Aug 4, 2023
1 parent ce453d9 commit 6ec14f7
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 37 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ Then, from the GitHub Updater interface, navigate to the "Install Theme" tab. En

## Changelog

### 2.26.0
* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.26.0
### 2.26.1
* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.26.1
* Full release history available at: https://github.com/pressbooks/pressbooks-book/releases
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"aetna": "^1.0.0",
"buckram": "^1.8.1",
"buckram": "^1.8.2",
"details-element-polyfill": "^2.4.0",
"lity": "^2.4.0",
"sharer.js": "^0.5.1",
Expand Down
7 changes: 7 additions & 0 deletions packages/buckram/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.8.2](https://github.com/pressbooks/buckram/compare/v1.8.1...v1.8.2) (2023-07-16)


### Bug Fixes

* update release instructions ([#332](https://github.com/pressbooks/buckram/issues/332)) ([b60dda3](https://github.com/pressbooks/buckram/commit/b60dda36f6858f2bb55e4f536abdf1080194fac0))

## [1.8.1](https://github.com/pressbooks/buckram/compare/v1.8.0...v1.8.1) (2023-01-04)


Expand Down
8 changes: 4 additions & 4 deletions packages/buckram/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Buckram

[![License](https://badgen.net/github/license/pressbooks/buckram)](https://github.com/pressbooks/buckram/blob/main/LICENSE) [![Build Status](https://badgen.net/github/status/pressbooks/buckram)](https://github.com/pressbooks/buckram/actions) [![Latest Release](https://badgen.net/npm/v/buckram)](https://www.npmjs.com/package/buckram)
[![License](https://badgen.net/github/license/pressbooks/buckram)](https://github.com/pressbooks/buckram/blob/production/LICENSE) [![Build Status](https://badgen.net/github/status/pressbooks/buckram)](https://github.com/pressbooks/buckram/actions) [![Latest Release](https://badgen.net/npm/v/buckram)](https://www.npmjs.com/package/buckram)

Opinionated SCSS components for books (web, EPUB and PDF).

Expand All @@ -23,8 +23,8 @@ npm test

## Releasing

[release-please](https://github.com/googleapis/release-please) will generate release notes in a PR automatically based on commits to `dev`.
Buckram uses [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/), enforced with [commitlint](https://commitlint.js.org/). This facilitates releasing new versions of the package via [Release Please](https://github.com/googleapis/release-please). Release notes will be automatically added to a PR based on commits to `dev`.

Merging the PR to tag a new GitHub release and update [CHANGELOG.md](CHANGELOG.md).
To cut a release, merge the current [release pull request](https://github.com/google-github-actions/release-please-action#whats-a-release-pr). This will tag a new GitHub release and update [CHANGELOG.md](CHANGELOG.md).

Then, run `npm publish`.
Then, run `npm publish` from the root of the package and enter your one-time password when prompted. For more information on publishing to npm, see the [npm publish documentation](https://docs.npmjs.com/cli/publish).
2 changes: 1 addition & 1 deletion packages/buckram/assets/styles/buckram.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Name: Buckram
* x-release-please-start-version
* Version: 1.8.1
* Version: 1.8.2
* x-release-please-end
* Description: Opinionated SCSS components for books (web, EPUB and PDF).
*/
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
.pullquote--outside + p,
.pullquote-inside + p,
.pullquote--inside + p,
.sidebar + p {
.sidebar + p,
.textbox--sidebar + p {
margin-top: $para-margin-top;
text-indent: $para-indent;
}
Expand Down Expand Up @@ -199,23 +200,6 @@
hyphens: none;
}

// When paragraphs follow a floated element, make sure indents work as expected.
// NOTE: this should only happen when paragraph separators = indent.

.wp-caption.alignleft + p,
.wp-nocaption.alignleft + p,
.wp-caption.alignright + p,
.wp-nocaption.alignright + p,
.float-top + p,
.float-bottom + p,
.pullquote + p,
.pullquote-right + p,
.pullquote-left + p,
.pullquote-outside + p,
.sidebar + p {
margin-top: $para-margin-top;
text-indent: $para-indent;
}

// Hanging Indents
.hanging-indent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
margin-inside: $textbox-sidebar-margin-inside;
}

max-width: 25%;
max-width: $textbox-sidebar-max-width;
}

@if $type == 'epub' {
Expand Down
4 changes: 2 additions & 2 deletions packages/buckram/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "buckram",
"version": "1.8.1",
"version": "1.8.2",
"description": "Opinionated SCSS components for books (web, EPUB and PDF).",
"scripts": {
"build": "composer install && composer test",
Expand Down Expand Up @@ -29,7 +29,7 @@
"pixelmatch": "^5.2.1",
"polyserve": "^0.27.15",
"pressbooks-build-tools": "^4.0.0",
"puppeteer": "^20.1.1",
"puppeteer": "^20.5.0",
"sassdoc": "^2.7.1",
"type-detect": "^4.0.8"
},
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Tags: Academic, Literary, Nonfiction, Textbook
Author: Pressbooks (Book Oven Inc.)
Author URI: https://pressbooks.com
Copyright: 2011-2023 Pressbooks (Book Oven Inc.) <[email protected]>
Version: 2.26.0
Version: 2.26.1
Text Domain: pressbooks-book
License: GPL v3.0 or later
GitHub Theme URI: pressbooks/pressbooks-book
Expand Down

0 comments on commit 6ec14f7

Please sign in to comment.