Skip to content

Commit

Permalink
fix: add support for shopping cart dashicon (#3488)
Browse files Browse the repository at this point in the history
* fix: add support for shopping cart heroicon

* chore: update npm dependencies

* chore: bump version & text matrix

* chore: update translation files
  • Loading branch information
SteelWagstaff committed Oct 10, 2023
1 parent 7e3ca72 commit 04c82dc
Show file tree
Hide file tree
Showing 22 changed files with 3,925 additions and 15,820 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/standards-and-tests.yml
Expand Up @@ -19,12 +19,12 @@ jobs:
os: [ubuntu-20.04]
epubcheck: [4.2.6]
prince: [14.3-1]
wordpress: [6.2.2, latest]
wordpress: [6.3.1, latest]
include:
- experimental: true
- experimental: false
php: 8.1
wordpress: 6.2.2
wordpress: 6.3.1

name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}

Expand Down
18 changes: 9 additions & 9 deletions README.md
@@ -1,9 +1,9 @@
# Pressbooks
Contributors: Pressbooks <code@pressbooks.com>
Tags: ebooks, publishing, webbooks
Requires at least: 6.2.2
Tested up to: 6.2.2
Stable tag: 6.15.0
Requires at least: 6.3.1
Tested up to: 6.3.1
Stable tag: 6.15.1
Requires PHP: 8.1
License: GPL v3.0 or later
License URI: https://github.com/pressbooks/pressbooks/blob/production/LICENSE.md
Expand All @@ -29,7 +29,7 @@ Our webbooks and EPUB/[PDF][pdf] exports are all driven by HTML + CSS. XML outpu

## Requirements

Pressbooks works with PHP 8.1 and WordPress 6.2.2. Lower versions are not supported.
Pressbooks works with PHP 8.1 and WordPress 6.3.1. Lower versions are not supported.

## Installing the Plugin

Expand All @@ -49,15 +49,15 @@ The Pressbooks plugin is supplied "as is" and all use is at your own risk.

## Changelog

### 6.15.0
* See: https://github.com/pressbooks/pressbooks/releases/tag/6.15.0
### 6.15.1
* See: https://github.com/pressbooks/pressbooks/releases/tag/6.15.1
* Full release history available at: https://github.com/pressbooks/pressbooks/releases

### 6.14.0
* See: https://github.com/pressbooks/pressbooks/releases/tag/6.14.0
* Full release history available at: https://github.com/pressbooks/pressbooks/releases

## Upgrade Notices
### 6.15.1
* Pressbooks 6.15.1 requires [WordPress 6.3.1](https://wordpress.org/documentation/wordpress-version/version-6-3-1/)

### 6.12.0
* Pressbooks 6.12.0 requires [WordPress 6.2.2](https://wordpress.org/documentation/wordpress-version/version-6-2-2/)

Expand Down
12 changes: 6 additions & 6 deletions assets/dist/mix-manifest.json
Expand Up @@ -11,11 +11,11 @@
"/scripts/ftnref-convert.js": "/scripts/ftnref-convert.js?id=818f4c429292cb7b6f34057dfcff8b09",
"/scripts/latex.js": "/scripts/latex.js?id=6393d17f0cdf9131ef0569f5801f1977",
"/scripts/glossary.js": "/scripts/glossary.js?id=9f99cf13c1ea3d050210428261fe73c1",
"/scripts/glossary-tooltip.js": "/scripts/glossary-tooltip.js?id=a303674237d7eff049f66dfb70674493",
"/scripts/glossary-tooltip.js": "/scripts/glossary-tooltip.js?id=dfc8cd3e4bae2ef8c7bf8ce8dc2bd690",
"/scripts/import.js": "/scripts/import.js?id=212e58dacae764405a4408ce7e20c44d",
"/scripts/login.js": "/scripts/login.js?id=428e5945062c207eabfb8a071122b059",
"/scripts/network-managers.js": "/scripts/network-managers.js?id=c5acf0a3a6f43e00081189e85a8176e0",
"/scripts/organize.js": "/scripts/organize.js?id=23a68203c362082495f4102199fc4daf",
"/scripts/organize.js": "/scripts/organize.js?id=054e4ba7b8d9bd7d24bdb4a987b9c381",
"/scripts/post-back-matter.js": "/scripts/post-back-matter.js?id=b402f38d4c6dd8747231f1c3c0af15af",
"/scripts/post-visibility.js": "/scripts/post-visibility.js?id=dcdfaa4cb48144a75e9e65f4053081fa",
"/scripts/post-mathjax.js": "/scripts/post-mathjax.js?id=fc1ebbaf87f941a02c179afa1d597e40",
Expand All @@ -30,7 +30,7 @@
"/scripts/export-footnotes.js": "/scripts/export-footnotes.js?id=6374a71d7b882e03e41c004d1411e689",
"/scripts/contributors.js": "/scripts/contributors.js?id=348b3ba30b1f91174fa89e3b5b376026",
"/scripts/algolia-search.js": "/scripts/algolia-search.js?id=6f22930340ff44e023e868ea597e0806",
"/styles/pressbooks.css": "/styles/pressbooks.css?id=e7b82022bbb5f5aaba300ef91ac925b0",
"/styles/pressbooks.css": "/styles/pressbooks.css?id=45d6055161cad694778f708a84aea0c0",
"/styles/export.css": "/styles/export.css?id=9fdb8491dce9f80a5034f70a977022b7",
"/styles/covergenerator.css": "/styles/covergenerator.css?id=1cd35bfc7c79a060df8417f8d21d95e1",
"/styles/colors-pb-a11y.css": "/styles/colors-pb-a11y.css?id=f7b0995dd8e6d16522cbbd245dc20deb",
Expand All @@ -57,9 +57,9 @@
"/scripts/select2.js": "/scripts/select2.js?id=7a6a34f44dae012b474c0b21f2abf097",
"/scripts/sidr.js": "/scripts/sidr.js?id=32495427b04ceeab53764448840988d8",
"/scripts/table.js": "/scripts/table.js?id=f259b57cdd1a1663e6e7979f836210c0",
"/scripts/alpine.min.js": "/scripts/alpine.min.js?id=d8b5eec18717a8d68d09dcc2310b4ee7",
"/scripts/instantsearch.production.min.js": "/scripts/instantsearch.production.min.js?id=7a53b2c3078b30325becaeae03bf36f5",
"/scripts/algoliasearch-lite.umd.js": "/scripts/algoliasearch-lite.umd.js?id=dc99f422a75b7015c3337efa126716b9",
"/scripts/alpine.min.js": "/scripts/alpine.min.js?id=5204f554708708c5cc4dbae443091245",
"/scripts/instantsearch.production.min.js": "/scripts/instantsearch.production.min.js?id=9c2037acce86724d1145eac040489c74",
"/scripts/algoliasearch-lite.umd.js": "/scripts/algoliasearch-lite.umd.js?id=1e3dc6f644974934ffcb81baf749d76a",
"/fonts/PBFont.eot": "/fonts/PBFont.eot?id=b5a01aa63cb5ed29ffc1470079bcdb77",
"/fonts/PBFont.svg": "/fonts/PBFont.svg?id=0c73d41a3596ee136209bbef31e33caa",
"/fonts/PBFont.ttf": "/fonts/PBFont.ttf?id=1d1febe039b5814b9811362fe7d12f1b",
Expand Down
4 changes: 2 additions & 2 deletions assets/dist/scripts/algoliasearch-lite.umd.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/dist/scripts/alpine.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/eventsource.polyfill.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/glossary-tooltip.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/dist/scripts/instantsearch.production.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/isotope.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/organize.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/paged.polyfill.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/select2.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/dist/scripts/table.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/dist/styles/pressbooks.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/src/styles/heroicons-bridge.scss
Expand Up @@ -71,6 +71,11 @@
.dashicons-admin-media {
@extend .pb-heroicons-camera;
}

.dashicons-cart {
@extend .pb-heroicons-shopping-cart;
}

/* stylelint-disable-next-line selector-id-pattern */
#toplevel_page_h5p .wp-menu-image {
@extend .pb-heroicons-h5p;
Expand Down
2 changes: 1 addition & 1 deletion compatibility.php
Expand Up @@ -35,7 +35,7 @@ function pb_meets_minimum_requirements() {

// WordPress Version
global $pb_minimum_wp;
$pb_minimum_wp = '6.2';
$pb_minimum_wp = '6.3.1';

include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
$is_compatible = true;
Expand Down
Binary file modified languages/pressbooks-de_DE.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion languages/pressbooks-de_DE.po
Expand Up @@ -1899,7 +1899,7 @@ msgid ""
"an account you can login <a href=\"/wp-login.php\">here</a>. You can also "
"set up your own Pressbooks book at: <a "
"href=\"http://pressbooks.com\">Pressbooks.com</a>."
msgstr "Dies ist ein privates Buch und nur für registrierte Benutzer zugänglich. Wenn Sie ein Benutzerkonto haben können Sie sich <a href=\"/wp-login.php\">hier</a> anmelden. Sie können auch Ihr eigenes Pressbooks Buch unter <a href=\"http://pressbooks.com\">Pressbooks.com</a> erzeugen."
msgstr "Dies ist ein privates Buch und nur für registrierte Benutzer zugänglich. Wenn Sie ein Benutzerkonto haben, können Sie sich <a href=\"/wp-login.php\">hier</a> anmelden. "

#: inc/class-activation.php:264 inc/class-customcss.php:91
msgid "Custom CSS for Ebook"
Expand Down
22 changes: 19 additions & 3 deletions languages/pressbooks.pot
Expand Up @@ -2,16 +2,16 @@
# This file is distributed under the GPL v3 or later.
msgid ""
msgstr ""
"Project-Id-Version: Pressbooks 6.14.0\n"
"Project-Id-Version: Pressbooks 6.15.1\n"
"Report-Msgid-Bugs-To: https://github.com/pressbooks/pressbooks/issues\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2023-08-03T22:29:37+00:00\n"
"POT-Creation-Date: 2023-10-10T08:45:40-07:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.8.1\n"
"X-Generator: WP-CLI 2.7.1\n"
"X-Domain: pressbooks\n"

#. Plugin Name of the plugin
Expand Down Expand Up @@ -131,6 +131,7 @@ msgstr ""
#: inc/admin/class-catalog-list-table.php:230
#: inc/class-activation.php:237
#: inc/modules/export/epub/class-epub.php:1233
#: tests/test-cloner.php:57
msgid "Cover"
msgstr ""

Expand Down Expand Up @@ -1293,6 +1294,7 @@ msgstr ""
#: inc/posttype/namespace.php:542
#: inc/posttype/namespace.php:580
#: templates/admin/import.php:94
#: tests/test-posttype.php:259
msgid "Part"
msgstr ""

Expand Down Expand Up @@ -1753,6 +1755,7 @@ msgid "Owner"
msgstr ""

#: inc/admin/network/class-networksettings.php:62
#: tests/test-networksettings.php:29
msgid "Theme Settings"
msgstr ""

Expand Down Expand Up @@ -1951,10 +1954,12 @@ msgid "Main Body"
msgstr ""

#: inc/class-activation.php:210
#: tests/test-book.php:47
msgid "Introduction"
msgstr ""

#: inc/class-activation.php:212
#: tests/test-book.php:97
msgid "This is where you can write your introduction."
msgstr ""

Expand All @@ -1975,13 +1980,15 @@ msgid "This is where you can add appendices or other back matter."
msgstr ""

#: inc/class-activation.php:232
#: tests/test-cloner.php:52
#: templates/admin/organize.blade.php:131
#: templates/admin/organize.blade.php:215
msgid "Authors"
msgstr ""

#: inc/class-activation.php:242
#: inc/modules/themeoptions/class-pdfoptions.php:322
#: tests/test-cloner.php:62
#: templates/export/epub/toc.blade.php:13
msgid "Table of Contents"
msgstr ""
Expand Down Expand Up @@ -2543,15 +2550,18 @@ msgid "Source Sans Pro"
msgstr ""

#: inc/class-styles.php:702
#: tests/test-styles.php:215
msgid "Theme default"
msgstr ""

#: inc/class-styles.php:703
#: inc/class-styles.php:717
#: tests/test-styles.php:216
msgid "Serif"
msgstr ""

#: inc/class-styles.php:704
#: tests/test-styles.php:217
msgid "Sans serif"
msgstr ""

Expand Down Expand Up @@ -3469,6 +3479,7 @@ msgid "About the Author"
msgstr ""

#: inc/modules/themeoptions/class-globaloptions.php:169
#: tests/test-options.php:501
msgid "Display information about authors at the end of each chapter"
msgstr ""

Expand Down Expand Up @@ -4232,6 +4243,7 @@ msgid " adapted by "
msgstr ""

#: inc/shortcodes/footnotes/class-footnotes.php:187
#: tests/test-shortcodes-footnotes-footnotes.php:149
msgid "Invalid permissions."
msgstr ""

Expand Down Expand Up @@ -4699,6 +4711,10 @@ msgstr ""
msgid "Pressbooks: the CMS for Books."
msgstr ""

#: tests/test-registration.php:28
msgid "Create Site"
msgstr ""

#: templates/admin/cloner/book-card.blade.php:9
msgid "H5P Activities"
msgstr ""
Expand Down

0 comments on commit 04c82dc

Please sign in to comment.