updates version and readme

.github/CHANGELOG.md

@@ -8,6 +8,17 @@
 
   -
 
+## Release 1.1.0-beta
+
+** Enhancements **
+
+  - Now supports Bootstrap 5 in addition to Bootstrap 4. Update your site in the Customizer. (If using a child theme, please check with your child theme author before updating.)
+  - New Feature: Offcanvas responsive menu support (Bootstrap 5 only)
+
+** Fixes **
+
+  -
+
 ##  Release 1.0.0 August 26th 2021
 
 ** Enhancements **

.github/README.md

@@ -34,7 +34,7 @@ Full documentation for this theme is available at [docs.understrap.com](https://
 ## Basic Features
 
 - Combines Underscore’s PHP/JS files and Bootstrap’s HTML/CSS/JS.
-- Comes with Bootstrap (v4) Sass source files and additional .scss files. Nicely sorted and ready to add your own variables and customize the Bootstrap variables.
+- Comes with Bootstrap (v4 and/or v5) Sass source files and additional .scss files. Nicely sorted and ready to add your own variables and customize the Bootstrap variables.
 - Uses a single minified CSS file for all the basic stuff.
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/) integration (v4.7.0)
 - Jetpack ready
@@ -106,12 +106,25 @@ module.exports = {
 };
 ```
 
-then run: 
+then run:
 
 ```bash
 npm run watch-bs
 ```
 
+## Bootstrap 4 Legacy Build Process
+
+Some of our build tasks have been duplicated to support both Bootstrap 4 and Boostrap 5 asset generation. The *default* version of tasks will generate v5 assets.
+
+**CSS Tasks** `npm run css` will generate v5 assets, while `npm run css-bs4` will generate necessary assets for v4.
+
+**JS Tasks** `npm run js` will generate v5 assets, while `npm run js-bs4` will generate necessary assets for v4.
+
+**Watch Tasks** `npm run watch` and `npm run watch-bs` will only generate for v5. Once complete, run `npm run dist` to update v4.
+
+**Dist Task** `npm run dist` will generate both v4 & v5 assets.
+
+**Other Assets** This theme also includes a few additional files directories to support Bootstrap 4 in `/src/build-bootstrap4/`, `/src/sass/assets/bootstrap4/`, and `/src/js/bootstrap4.js`
 
 ## Block Editor (Gutenberg) Support
 
@@ -148,7 +161,7 @@ The theme also includes a number of templates for enabling the right and left si
 
 ### Full Width Template
 
-The `fullwidthpage.php` template has full width layout without a sidebar. 
+The `fullwidthpage.php` template has full width layout without a sidebar.
 
 
 Licenses & Credits

inc/editor-color-palette.json

@@ -1 +1 @@
-{"--bs-blue":"#0d6efd","--bs-indigo":"#6610f2","--bs-purple":"#5533ff","--bs-pink":"#d63384","--bs-red":"#dc3545","--bs-orange":"#fd7e14","--bs-yellow":"#ffc107","--bs-green":"#198754","--bs-teal":"#20c997","--bs-cyan":"#0dcaf0","--bs-white":"#fff","--bs-gray":"#6c757d","--bs-gray-dark":"#343a40"}
+{}--bs-blue":"#0d6efd","--bs-indigo":"#6610f2","--bs-purple":"#5533ff","--bs-pink":"#d63384","--bs-red":"#dc3545","--bs-orange":"#fd7e14","--bs-yellow":"#ffc107","--bs-green":"#198754","--bs-teal":"#20c997","--bs-cyan":"#0dcaf0","--bs-white":"#fff","--bs-gray":"#6c757d","--bs-gray-dark":"#343a40"}

js/theme-bootstrap4.js

@@ -1,5 +1,5 @@
 /*!
-  * Understrap v1.0.0 (https://understrap.com)
+  * Understrap v1.1.0-beta (https://understrap.com)
   * Copyright 2013-2021 The UnderStrap Authors (https://github.com/understrap/understrap/graphs/contributors)
   * Licensed under GPL (http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
   */

js/theme-bootstrap4.min.js

@@ -1,5 +1,5 @@
 /*!
-  * Understrap v1.0.0 (https://understrap.com)
+  * Understrap v1.1.0-beta (https://understrap.com)
   * Copyright 2013-2021 The UnderStrap Authors (https://github.com/understrap/understrap/graphs/contributors)
   * Licensed under GPL (http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
   */

js/theme.js

@@ -1,5 +1,5 @@
 /*!
-  * Understrap v1.0.0 (https://understrap.com)
+  * Understrap v1.1.0-beta (https://understrap.com)
   * Copyright 2013-2021 The UnderStrap Authors (https://github.com/understrap/understrap/graphs/contributors)
   * Licensed under GPL (http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
   */

js/theme.min.js

@@ -1,5 +1,5 @@
 /*!
-  * Understrap v1.0.0 (https://understrap.com)
+  * Understrap v1.1.0-beta (https://understrap.com)
   * Copyright 2013-2021 The UnderStrap Authors (https://github.com/understrap/understrap/graphs/contributors)
   * Licensed under GPL (http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
   */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "understrap",
-  "version": "1.0.0",
+  "version": "1.1.0-beta",
   "description": "WordPress Theme framework",
   "main": "index.js",
   "scripts": {
@@ -9,8 +9,9 @@
     "css-compile": "sass --style expanded --source-map --embed-sources --no-error-css --quiet src/sass/theme.scss:css/theme.css src/sass/custom-editor-style.scss:css/custom-editor-style.css",
     "css-minify": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output css/ --batch --batch-suffix \".min\" \"css/*.css\" \"!css/*.min.css\" \"!css/*rtl*.css\"",
     "css-postcss": "postcss --config src/build/postcss.config.js --replace \"css/*.css\" \"!css/*.rtl*.css\" \"!css/*.min.css\"",
-    "css-bs4": "npm-run-all css-compile-bs4 css-postcss-bs4 css-minify",
+    "css-bs4": "npm-run-all css-compile-bs4 css-postcss-bs4 css-minify-bs4",
     "css-compile-bs4": "sass --style expanded --source-map --embed-sources --no-error-css --quiet src/sass/theme-bootstrap4.scss:css/theme-bootstrap4.css src/sass/custom-editor-style-bootstrap4.scss:css/custom-editor-style-bootstrap4.css",
+    "css-minify-bs4": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output css/ --batch --batch-suffix \".min\" \"css/*.css\" \"!css/*.min.css\" \"!css/*rtl*.css\"",
     "css-postcss-bs4": "postcss --config src/build-bootstrap4/postcss.config.js --replace \"css/*.css\" \"!css/*.rtl*.css\" \"!css/*.min.css\"",
     "js": "npm-run-all js-compile js-minify",
     "js-compile": "rollup --config src/build/rollup.config.js --sourcemap",

src/build-bootstrap4/banner.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const pkg = require('../../package.json')
+const year = new Date().getFullYear()
+
+function getBanner(pluginFilename) {
+  return `/*!
+  * Understrap${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage})
+  * Copyright 2013-${year} ${pkg.author}
+  * Licensed under GPL (http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+  */`
+}
+
+module.exports = getBanner

src/build-bootstrap4/rollup.config.js

@@ -4,7 +4,7 @@ const path = require('path')
 const { babel } = require('@rollup/plugin-babel')
 const { nodeResolve } = require('@rollup/plugin-node-resolve')
 import multi from '@rollup/plugin-multi-entry'
-const banner = require('../build/banner.js')
+const banner = require('./banner.js')
 
 let fileDest = 'theme-bootstrap4.js'
 const external = ['jquery']

style.css

@@ -5,14 +5,14 @@ Author: Howard Development & Consulting
 Author URI: https://howarddc.com
 GitHub Theme URI: https://github.com/understrap/understrap
 Description: The renowned WordPress starter theme framework that combined Underscores and Bootstrap. Trusted by more than 100,000 developers for building handcrafted, custom WordPress sites.
-Version: 1.0.0
+Version: 1.1.0-beta
 Requires at least: 5.0
-Tested up to: 5.8
+Tested up to: 5.8.1
 Requires PHP: 5.2
 License: GNU General Public License v3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Text Domain: understrap
-Tags: one-column, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-logo, custom-menu, featured-images, footer-widgets, full-width-template, theme-options, translation-ready
+Tags: one-column, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-logo, custom-menu, featured-images, footer-widgets, full-width-template, theme-options, translation-ready, block-styles, wide-blocks, editor-style, threaded-comments
 
 Understrap WordPress Theme, (C) 2021 Howard Development & Consulting, LLC
 Understrap is distributed under the terms of the GNU GPL.