Skip to content

Commit 0f230f6

Browse files
authored
Merge pull request #316 from understrap/develop
Official 1.1.0 Release Version
2 parents 68cd1c5 + 9612a79 commit 0f230f6

File tree

119 files changed

+29101
-18772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+29101
-18772
lines changed

.github/README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ It will be outputted into:
3232

3333
So you have one clean CSS file at the end and just one request.
3434

35-
Add your own JS files to `/src/js/` to have them bundled into `/js/child-theme.js` and `/js/child-theme.min.js`.
35+
Add your own JS to `/src/js/custom-javascript.js` to have it bundled into `/js/child-theme.js` and `/js/child-theme.min.js`. If you'd like to add additional files, you'll need to add the filenames to the Rollup.js config file: `/src/build/rollup.config.js`.
3636

3737
## Developing With NPM, postCSS, Rollup, SASS and BrowserSync
3838

@@ -44,7 +44,7 @@ Some basics about the files that come with Understrap:
4444
- The theme itself uses the `/style.css` file only to identify the theme inside of WordPress. The file is not loaded by the theme and does not include any styles.
4545
- The `/css/child-theme.css` and its minified little brother `/css/child-theme.min.css` file(s) provides all styles. It is composed of different SCSS sets and one variable file, all imported at `/src/sass/child-theme.scss`
4646
- Your design goes into: `/src/sass/child-theme`.
47-
- Override Bootstrap by addind your variables to the `/src/sass/theme/_child_theme_variables.scss`
47+
- Override Bootstrap by adding your variables to the `/src/sass/theme/_child_theme_variables.scss`
4848
- Add your custom styles to the `/src/sass/theme/_child_theme.scss` file
4949
- Or add other .scss files into it and `@import` it into `/src/sass/theme/_child_theme.scss`.
5050

@@ -76,6 +76,12 @@ module.exports = {
7676
then run:
7777

7878
```bash
79-
npm run watch
79+
npm run watch-bs
8080
```
8181

82+
83+
## Bootstrap 4 Support
84+
85+
This child theme uses Bootstrap 5 and requires Understrap Parent Theme 1.1 or greater for best functionality. It does not create JS or CSS files that work with Bootstrap 4 markup. In fact, in the `functions.php` file, this child theme overrides the parent theme's customizer settings.
86+
87+
If you want to build a child theme with Bootstrap 4, please use [the 1.0.1 child theme release](https://github.com/understrap/understrap-child/releases/tag/v1.0.1) as it was the last version built to support Bootstrap 4.

0 commit comments

Comments
 (0)