From 6ec14f710d2f2240d52e067f8cd3fa92234cc926 Mon Sep 17 00:00:00 2001 From: Steel Wagstaff Date: Thu, 3 Aug 2023 17:07:08 -0700 Subject: [PATCH] chore: update buckram & bump version (#1178) --- README.md | 4 ++-- package-lock.json | 14 ++++++------- package.json | 2 +- packages/buckram/CHANGELOG.md | 7 +++++++ packages/buckram/README.md | 8 ++++---- packages/buckram/assets/styles/buckram.scss | 2 +- .../components/elements/_paragraphs.scss | 20 ++----------------- .../components/specials/_textboxes.scss | 2 +- packages/buckram/package.json | 4 ++-- style.css | 2 +- 10 files changed, 28 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 41efc830e..00dfe8d6d 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/package-lock.json b/package-lock.json index 99f63c9e6..5bb48ed08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "license": "GPL-3.0-or-later", "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", @@ -3957,9 +3957,9 @@ "integrity": "sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==" }, "node_modules/buckram": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/buckram/-/buckram-1.8.1.tgz", - "integrity": "sha512-NdmZPtnLNOlJMuc4yDeMvGa3bYZSCvLKQv/y6PwZNHyNRJIMT+r+SmenLWcVm2m10Y91XO7717A4jU4s2dZLtQ==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/buckram/-/buckram-1.8.2.tgz", + "integrity": "sha512-Q/YNx8fSFxwd81sJfHbxLVd+PTrmggxg5ODKONAA00DsSO0DBIo/sSJT1a3DOHhCYimtS79neehK/EQHer5+yA==", "engines": { "node": ">= 14" } @@ -22845,9 +22845,9 @@ "integrity": "sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==" }, "buckram": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/buckram/-/buckram-1.8.1.tgz", - "integrity": "sha512-NdmZPtnLNOlJMuc4yDeMvGa3bYZSCvLKQv/y6PwZNHyNRJIMT+r+SmenLWcVm2m10Y91XO7717A4jU4s2dZLtQ==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/buckram/-/buckram-1.8.2.tgz", + "integrity": "sha512-Q/YNx8fSFxwd81sJfHbxLVd+PTrmggxg5ODKONAA00DsSO0DBIo/sSJT1a3DOHhCYimtS79neehK/EQHer5+yA==" }, "buffer": { "version": "4.9.2", diff --git a/package.json b/package.json index bba6e1c3e..d587e1ed6 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/buckram/CHANGELOG.md b/packages/buckram/CHANGELOG.md index b1d00c39a..5c22b4ea8 100644 --- a/packages/buckram/CHANGELOG.md +++ b/packages/buckram/CHANGELOG.md @@ -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) diff --git a/packages/buckram/README.md b/packages/buckram/README.md index 668984fee..27c0a09e6 100644 --- a/packages/buckram/README.md +++ b/packages/buckram/README.md @@ -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). @@ -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). diff --git a/packages/buckram/assets/styles/buckram.scss b/packages/buckram/assets/styles/buckram.scss index eb6a78984..eba8ed039 100644 --- a/packages/buckram/assets/styles/buckram.scss +++ b/packages/buckram/assets/styles/buckram.scss @@ -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). */ diff --git a/packages/buckram/assets/styles/components/elements/_paragraphs.scss b/packages/buckram/assets/styles/components/elements/_paragraphs.scss index 1b8c16db7..584dca363 100644 --- a/packages/buckram/assets/styles/components/elements/_paragraphs.scss +++ b/packages/buckram/assets/styles/components/elements/_paragraphs.scss @@ -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; } @@ -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 { diff --git a/packages/buckram/assets/styles/components/specials/_textboxes.scss b/packages/buckram/assets/styles/components/specials/_textboxes.scss index c5d72606a..a7c29e0a1 100644 --- a/packages/buckram/assets/styles/components/specials/_textboxes.scss +++ b/packages/buckram/assets/styles/components/specials/_textboxes.scss @@ -212,7 +212,7 @@ margin-inside: $textbox-sidebar-margin-inside; } - max-width: 25%; + max-width: $textbox-sidebar-max-width; } @if $type == 'epub' { diff --git a/packages/buckram/package.json b/packages/buckram/package.json index 65cde65fd..e40e580b4 100644 --- a/packages/buckram/package.json +++ b/packages/buckram/package.json @@ -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", @@ -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" }, diff --git a/style.css b/style.css index 8230e4fdd..69928508e 100644 --- a/style.css +++ b/style.css @@ -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.) -Version: 2.26.0 +Version: 2.26.1 Text Domain: pressbooks-book License: GPL v3.0 or later GitHub Theme URI: pressbooks/pressbooks-book