Merge branch 'GlobalToCToggles' of github.com:dbolack-ab/homebrewery into GlobalToCToggles

.github/pull_request_template.md

@@ -0,0 +1,36 @@
+<!--
+     Before submitting a Pull Request, please consider the following to speed up reviews:
+     - 👷‍♀️ Create small PRs. Large PRs can usually be broken down into incremental PRs.
+     - 🚩 Do you already have several open PRs? Consider finishing or asking for help with existing PRs first.
+     - 🔧 Does your PR reference a discussed and approved issue, especially for personal or edge-case requests?
+     - 💡 Is the solution agreed upon? Save rework time by discussing strategy before coding.
+-->
+
+## Description
+
+
+## Related Issues or Discussions
+
+- Closes #
+
+## QA Instructions, Screenshots, Recordings
+
+_Please replace this line with instructions on how to test or view your changes, as well as any before/after
+images for UI changes._
+
+### Reviewer Checklist
+
+_Please replace the list below with specific features you want reviewers to look at._
+
+*Reviewers, refer to this list when testing features, or suggest new items *
+- [ ] Verify new features are functional
+  - [ ] Feature A does X
+  - [ ] Feature B does Y
+- [ ] Verify old features have not broken
+  - [ ] Feature Z can still be used
+- [ ] Test for edge cases / try to break things
+  - [ ] Feature A handles negative numbers
+- [ ] Identify opportunities for simplification and refactoring
+- [ ] Check for code legibility and appropriate comments
+
+<details><summary>Copy this list</summary>

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -70,7 +70,7 @@ const Snippetbar = createClass({
 	mergeCustomizer : function(oldValue, newValue, key) {
 		if(key == 'snippets') {
 			const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme
-			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
+			return result.filter(snip => snip.gen || snip.subsnippets);
 		}
 	},
 

themes/V3/5ePHB/snippets.js

@@ -108,7 +108,7 @@ module.exports = [
 						icon : 'fas fa-dice-four',
 						gen  : dedent`/* Add ToC include for H3 and H4 level Headers */
 									.page h3, .page h4 {
-  								    	--TOC: include;
+										--TOC: include;
 									}\n\n`
 					},
 					{
@@ -116,7 +116,7 @@ module.exports = [
 						icon : 'fas fa-dice-five',
 						gen  : dedent`/* Add ToC include for H3, H4, and H5 level Headers */
 									.page h3, .page h4, .page h5 {
-	  								    --TOC: include;
+										--TOC: include;
 									}\n\n`
 					},
 					{
@@ -124,7 +124,7 @@ module.exports = [
 						icon : 'fas fa-dice-six',
 						gen  : dedent`/* Add ToC include for H3, H4, H5, and H6 level Headers */
 									.page h3, .page h4, .page h5, .page h6 {
-	  								    --TOC: include;
+										--TOC: include;
 									}\n\n`
 					},
 				]

themes/V3/5ePHB/style.less

@@ -814,6 +814,18 @@ h6,
 .tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC: include; }
 .tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC: include; }
 
+.page:has(.tocGobalH4) {
+	h4 {--TOC: include; }
+}
+
+.page:has(.tocGobalH5) {
+	h4, h5 {--TOC: include; }
+}
+
+.page:has(.tocGobalH6) {
+	h4, h5, h6 {--TOC: include; }
+}
+
 .tocIncludeH1 h1 {--TOC: include; }
 .tocIncludeH2 h2 {--TOC: include; }
 .tocIncludeH3 h3 {--TOC: include; }