Readme.md

@@ -1,14 +1,4 @@
-# DS2-core
+# DS2 Core
-DS2-core is a lightweight PugJS-based framework for building design systems. 
-
-The design system compiles to mostly pure HTML, SCSS and JavaScript. There are a few enhanced parts that use PHP in order to handle non-critical tasks Zip files on the fly to collect component JavaScript and SCSS. PugJS is used because it can handle some of the automation such as creating includes making components extremely modular.
-
-## Requirements 
-The requirements for ds2-core are pretty light. You'll want to be able to process [PugJS](https://pugjs.org/api/getting-started.html) (formerly Jade) and [SCSS](https://sass-lang.com/documentation/) -- and that's about it. 
-
-For our own design system, we use ds2-core with [Prepros](https://prepros.io) (which you can use the Free Unlimited Trial for, but why not splurge and spend the $30USD to support the developer and skip the nags). On MacOS, you could also use [CodeKit](https://codekitapp.com/). 
-
-Alternatively, if you have pre-processor pipelines for Pug and SCSS, which you can install using npm, or any other language you decide to pull in, you can use those to compile if that ends up being easier for you. The framework isn't too picky, so long as things go into the right place. 
 
 ## "Installation"
 
@@ -21,23 +11,20 @@ src/pg/core/download.php.pug  | public
 
 All other pug files should compile to from src/pg/ to a relative path of public/*
 
+
 ## Running the core
 
-### Callback functions 
+functions
-Callback functions can be used in 
 
-- beforeArticleLoad - called before any patterns have started to load 
+beforeArticleLoad - called before any patterns are started to load 
-- success - called when loading a pattern is successful if the result is an HTTP 200
+success - called when loading a pattern is successful if the result is an HTTP 200
-- afterArticleLoad - called after any patterns have started to load 
+afterArticleLoad - called after any patterns are started to load 
-- done - called when the ajax for any pattern is done, whether successful or not. This is a useful place to load any javascript initializations that pattern. 
+done - called when the ajax for any pattern is done, whether successful or not. This is a useful place to load any javascript initializations that pattern. 
 
 
-## Creating an item
+## About the content variable
 
-
+The content variable in \_config.pug defines your array of patterns. It is made up of the following attributes: 
-## The content object
-
-The content variable in \/src\/pg\/_config.pug defines your array of patterns. It is made up of the following attributes: 
 - name - the hypenated name of the pattern
 - status - this should be one of the statuses from your status array
 - display - (optional) if present this will be displayed, as is, instead of the name
@@ -62,42 +49,6 @@ In your design system implementation,
 
 This will ensure that the .pug file will get processed and the .pp file will be handled as text will get compiled, but they should display correctly and remain in sync while maintaining the minimum number of files. 
 
-## Using core code with your own pattern documentation. 
-Using 
-
----
-Creating a new pattern
-Begin by creating a folder within your strucutre to hold the pattern. Add the folder to your config file. 
-
-
-Generating css 
-You've likely created your component's css as an include file beginning with an underscore. create a second file named the same that includes any dependencies (such as breakpoints) that are required to generate your valid css. 
-
-You can now include the css in your pattern's index file. 
-
-Generating pug
-Create a custom tool in prepros, give it a name such as "PP to Pug" set the input extension to .pp and the output extension to .pug and check Process Automatically . The command should be 
-Mac / Linux
-	cp {{input}} {{output}}
-
-Windows 
-	copy {{input}} {{output}}
-
-Once you've added the tool, set the output to "relative path" and set the output extension to pug. For each .pp file you may have to check process automatically as it doesn't always identify the new extension.
-
-You will now be able to include the .pp file in your pattern's index file while including the .pug file which will give a compiled version of your component's html. 
-
-
----
-
-
-
-
-
-
-
-## Troubleshooting
-
 
 ## Credits 
 This framework includes [PrismJS](https://prismjs.com/) for code syntax highlighting. PrismJS is released under the [MIT license](https://opensource.org/licenses/MIT)>

ds2 core.sublime-workspace

@@ -281,14 +281,17 @@
 	"expanded_folders":
 	[
 		"/Users/am/Desktop/ds2-core",
-		"/Users/am/Desktop/ds2-core/src/pg/patterns"
+		"/Users/am/Desktop/ds2-core/src",
+		"/Users/am/Desktop/ds2-core/src/pg",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns/core",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components/sticky-note",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components/switch",
+		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components/tooltip"
 	],
 	"file_history":
 	[
-		"/Users/am/Desktop/ds2-core/src/js/scaffolding.js",
-		"/Users/am/Desktop/ds2-core/src/js/core/_core.js",
-		"/Users/am/Desktop/ds2-core/Readme.md",
-		"/Users/am/Desktop/ds2-core/src/pg/core/_colour-samples.pug",
 		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components/switch/index.pug",
 		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/components/sticky-note/index.pug",
 		"/Users/am/Desktop/ds2-core/src/pg/patterns/core/layouts/breakpoints/index.pug",
@@ -412,11 +415,15 @@
 		"/Users/am/Desktop/my DS2/src/pg/patterns/components/tooltip/index.pug",
 		"/Users/am/Desktop/my DS2/src/pg/patterns/components/link/index.pug",
 		"/Users/am/Desktop/my DS2/src/pg/patterns/components/progress-bar/index.pug",
-		"/Users/am/Desktop/my DS2/src/pg/patterns/layouts/main-navigation/index.pug"
+		"/Users/am/Desktop/my DS2/src/pg/patterns/layouts/main-navigation/index.pug",
+		"/Users/am/Desktop/my DS2/src/pg/patterns/layouts/breakpoints/index.pug",
+		"/Users/am/Desktop/my DS2/src/pg/patterns/visual-design/notifications/index.pug",
+		"/Users/am/Desktop/my DS2/src/pg/patterns/visual-design/spacing/spacing.css",
+		"/Users/am/Desktop/my DS2/src/pg/patterns/visual-design/colours/index.pug"
 	],
 	"find":
 	{
-		"height": 24.0
+		"height": 26.0
 	},
 	"find_in_files":
 	{
@@ -431,7 +438,6 @@
 		"case_sensitive": false,
 		"find_history":
 		[
-			"oneClickSelect",
 			"../core/_master-pattern.pug",
 			"../core",
 			"hide-deprecated",
@@ -505,7 +511,7 @@
 	],
 	"incremental_find":
 	{
-		"height": 24.0
+		"height": 26.0
 	},
 	"input":
 	{
@@ -550,7 +556,7 @@
 	"project": "ds2 core.sublime-project",
 	"replace":
 	{
-		"height": 44.0
+		"height": 68.0
 	},
 	"save_all_on_build": false,
 	"select_file":

prepros.config

@@ -1207,9 +1207,6 @@
             "concat-js": {
               "enable": false
             },
-            "babel": {
-              "enable": true
-            },
             "bundle-js": {
               "enable": true,
               "options": {

public/assets/scaffolding-min.js

@@ -4,34 +4,31 @@
 /* 1 */
 /***/ (function(module) {
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+const getDate = function(){
-var getDate = function getDate() {
 	var d = new Date();
-  return d.toLocaleDateString(lang, {
+	return d.toLocaleDateString(lang, {day: "numeric", month: "long", year: "numeric"});
-    day: "numeric",
+}
-    month: "long",
+String.prototype.toTitleCase = function() {
-    year: "numeric"
+	return this.replace(/\w\S*/g, function(txt) {
-  });
-};
-String.prototype.toTitleCase = function () {
-  return this.replace(/\w\S*/g, function (txt) {
      return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
    });
-};
+}
-String.prototype.toSentenceCase = function () {
+String.prototype.toSentenceCase = function() {
 	return this.charAt(0).toUpperCase() + this.substr(1).toLowerCase();
-};
+}
-String.prototype.toContent = function () {
+String.prototype.toContent = function() {
 	return this.replace(/-/g, " ");
-};
+}
-String.prototype.toPath = function () {
+String.prototype.toPath = function() {
 	return this.trim().replace(/ /g, "_").replace(/-/g, "_").replace(/[\/\W]/g, "").replace(/_/g, "-");
-};
+}
-var font = {
+
+const font = {
 	size: 0
-};
+}
-var copyFallback = function copyFallback(copyInfo, attr) {
+
-  console.log("fallback");
+const copyColourFallback = (copyInfo, attr) => {
+	console.log("fallback")
 	var textArea = document.createElement('textarea');
 	textArea.value = copyInfo;
 
@@ -39,101 +36,48 @@ var copyFallback = function copyFallback(copyInfo, attr) {
 	textArea.style.top = '0';
 	textArea.style.left = '0';
 	textArea.style.position = 'fixed';
+
 	document.body.appendChild(textArea);
 	textArea.focus();
 	textArea.select();
+
 	try {
 		var successful = document.execCommand('copy');
 		setTimeout(function () {
 			if (successful) {
 				//copyInfo.success();
-        showMessage("Copied ".concat(attr, "."));
+				showMessage(`Copied ${attr}.`)
 			} else {
 				//copyInfo.error();
-        showMessage("Copy failed (".concat(attr, ")."), false);
+				showMessage(`Copy failed (${attr}).`, false)
 			}
 		}, 1);
 	} catch (err) {
 		setTimeout(function () {
-      showMessage("Copy failed (".concat(attr, "). ").concat(err.Message), false);
+			showMessage(`Copy failed (${attr}). ${err.Message}`, false);
 			
 			//copyInfo.error(err);
 		}, 1);
 	}
 	document.body.removeChild(textArea);
-};
+}
-var showMessage = function showMessage(m, s) {
+
+const showMessage = (m, s) => {
 	s = s == undefined ? true : s;
 	console.log("Copy success (navigator.clipboard)");
-  var status = document.createElement("div");
+	let status = document.createElement("div");
 	status.setAttribute("id", "copystatus");
 	// status.style.display = "none";
-  status.innerHTML = "<div class='" + (s ? "succeeded" : "failed") + "'>" + m + "</div>";
+	status.innerHTML = "<div class='"+(s ? "succeeded" : "failed")+"'>" + m + "</div>";
-  document.querySelector("body").prepend(status);
+	document.querySelector("body").prepend(status)
-  status.querySelector("div").style.top = window.scrollY + 100 + "px";
+
-  setTimeout(function () {
+	status.querySelector("div").style.top = (window.scrollY + 100)+ "px";
+	setTimeout( () => {
 		status.remove();
 	}, 1000); 
-};
+}
-var getURLVars = function getURLVars() {
+
-  var oResult = {};
+const oneClickSelect = (e, t = e.currentTarget) => {
-  if (location.search.length > 0) {
-    var aQueryString = location.search.substr(1).split("&");
-    for (var i = 0; i < aQueryString.length; i++) {
-      var aTemp = aQueryString[i].split("=");
-      if (aTemp[1].length > 0) {
-        oResult[aTemp[0]] = decodeURIComponent(aTemp[1].replace(/\+/g, '%20'));
-      }
-    }
-  }
-  return oResult;
-};
-module.exports = {
-  url: function () {
-    var v = {};
-    if (location.search.length > 0) {
-      var qs = location.search.substr(1).split("&");
-      for (var i = 0; i < qs.length; i++) {
-        var t = qs[i].split("=");
-        if (t[1].length > 0) {
-          v[t[0]] = decodeURIComponent(t[1].replace(/\+/g, '%20'));
-        }
-      }
-    }
-    return v;
-  }(),
-  cookie: {
-    set: function set(name, value, expires, path, domain, secure) {
-      switch (_typeof(expires)) {
-        case "number":
-          var d = new Date();
-          expires = d.setTime(d + expires * 24 * 60 * 60 * 1000);
-          break;
-        case "object":
-          expires = expires.toGMTString();
-      }
-      document.cookie = name + "=" + escape(value) + (expires ? "; expires=" + expires : "") + "; path=/" + (domain ? "; domain=" + domain : "") + (secure ? "; secure" : "");
-    },
-    get: function get(cname) {
-      var name = cname + "=";
-      var ca = document.cookie.split(";");
-      for (var i = 0; i < ca.length; i++) {
-        var c = ca[i];
-        while (c.charAt(0) === " ") {
-          c = c.substring(1);
-        }
-        if (c.indexOf(name) === 0) {
-          return c.substring(name.length, c.length);
-        }
-      }
-      return "";
-    },
-    remove: function remove(cname) {
-      module.exports.cookie.set(cname, null, new Date(null));
-    }
-  },
-  oneClickSelect: function oneClickSelect(e) {
-    var t = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : e.currentTarget;
 	// In here, "this" is the element
 	var range, selection;
 	if (window.getSelection) {
@@ -147,162 +91,210 @@ module.exports = {
 		range.moveToElementText(t);
 		range.select();
 	}
+}
+
+const getURLVars = () => {
+	var oResult = {};
+	if (location.search.length > 0) {
+		var aQueryString = (location.search.substr(1)).split("&");
+		for (var i = 0; i < aQueryString.length; i++) {
+			var aTemp = aQueryString[i].split("=");
+			if (aTemp[1].length > 0) {
+				oResult[aTemp[0]] = decodeURIComponent(aTemp[1].replace(/\+/g, '%20'));
+			}
+		}
+	}
+	return oResult;
+}
+
+module.exports = {
+	url: getURLVars(),
+	cookie: {	
+		set: (name, value, expires, path, domain, secure) => {
+			switch(typeof expires) {
+				case "number" : 
+					var d = new Date()
+					expires = d.setTime(d + (expires*24*60*60*1000));
+				break;
+				case "object" : 
+					expires = expires.toGMTString();
+			}
+			document.cookie= name + "=" + escape(value) +
+				((expires) ? "; expires=" + expires : "") +
+				("; path=/") +
+				((domain) ? "; domain=" + domain : "") +
+				((secure) ? "; secure" : "");
+		},
+		get: (cname) => {
+			var name = cname + "=";
+			var ca = document.cookie.split(";");
+			for(var i = 0; i <ca.length; i++) {
+				var c = ca[i];
+				while (c.charAt(0)===" ") {
+					c = c.substring(1);
+				}
+				if (c.indexOf(name) === 0) {
+					return c.substring(name.length,c.length);
+				}
+			}
+			return "";
+		},
+		remove: (cnane) => {
+			setCookie(cname, "", -1);
+		},
 	},
 	colour: {
-    copy: function copy(w, t) {
+
-      var c = t.parentNode.getAttribute("data-" + (w == "var" ? "token" : w));
+		copy:  (w, t) => {
-      c = w == "var" ? "var(".concat(c, ")") : c;
+			let c = t.parentNode.getAttribute("data-" + (w=="var" ? "token" : w));
+			c = w == "var" ? `var(${c})` : c;
+
 			if (navigator.clipboard) {
-        navigator.clipboard.writeText(c).then(function () {
+				navigator.clipboard.writeText(c).then(function() {
-          showMessage("Copied ".concat(w, "."));
+					showMessage(`Copied ${w}.`);
-        }, function (e) {
+				}, function(e) {
-          copyFallback(c, w);
+					copyColourFallback(c,w);
 				});
 			} else {
-        copyFallback(c, w);
+				copyColourFallback(c, w);
 			}
 		},
-    positionTooltip: function positionTooltip() {
+
-      document.querySelectorAll("color-pill > span").forEach(function (ps) {
+		positionTooltip: () => {
-        ps.querySelectorAll("div.tooltip-tc").forEach(function (tip) {
+			document.querySelectorAll("color-pill > span").forEach((ps) =>  {
-          if (font.size * 10 > ps.offsetLeft) {
+				ps.querySelectorAll("div.tooltip-tc").forEach((tip) => {
+					if ( (font.size * 10) > ps.offsetLeft ) {
 						tip.setAttribute("tip-position", "right");
 					} else {
 						tip.setAttribute("tip-position", "bottom");
 					}
 				});
-      });
+			})
 		}
 	},
-  getCSS: function getCSS(el, prop) {
+	init: (args = {}) => {
-    var b = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+		const url = getURLVars();
-    return window.getComputedStyle(el, null).getPropertyValue(prop);
+		font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px",""));
-  },
-  getTabPath: function getTabPath(t) {
-    var url = window.location.toString();
-    url = url.indexOf("?") > 0 ? url.substring(0, url.indexOf("?")) : url;
-    url = "".concat(url, "?p=").concat(t.closest("article").getAttribute("data-path"), "#").concat(t.getAttribute("id"));
-    var type = "URL";
-    if (navigator.clipboard) {
-      navigator.clipboard.writeText(url).then(function () {
-        showMessage("Copied ".concat(type, "."));
-      }, function (e) {
-        copyFallback(url, type);
-      });
-    } else {
-      copyFallback(url, type);
-    }
-  },
-  init: function init() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var url = getURLVars();
-    font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px", ""));
 		if (url.p !== undefined) {
-      document.querySelectorAll("main article:not([data-path^='" + url.p + "'])").forEach(function (a) {
+			document.querySelectorAll("main article:not([data-path^='" + url.p + "'])").forEach((a) => {
 				a.remove();
 			});
+
 			if (url.p == -1) {
-        document.querySelector("title").innerHTML = "".concat(url.p.toContent().toTitleCase(), " | ").concat(document.querySelector("title").getAttribute("data-site"));
+				document.querySelector("title").innerHTML = `${url.p.toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`;
 			} else {
-        var theTitle = document.querySelectorAll("article");
+				document.querySelector("title").innerHTML = `${url.p.substring(url.p.lastIndexOf("/")+1).toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`
-        if (theTitle.length > 0) {
-          theTitle = theTitle[0].getAttribute("data-name").toContent().toTitleCase();
-          if (document.querySelector("article").getAttribute("data-display") !== null) {
-            theTitle = document.querySelector("article").getAttribute("data-display");
-          }
-          document.querySelector("title").innerHTML = "".concat(theTitle, " | ").concat(document.querySelector("title").getAttribute("data-site"));
-        }
 			}
 		}
+
 		if (typeof args.beforeArticleLoad == "function") args.beforeArticleLoad();
-    document.querySelectorAll("article").forEach(function (a) {
+
-      if (a.getAttribute("data-template") != "none") {
+		document.querySelectorAll("article").forEach((a) => {
-        var observer = new IntersectionObserver(function (articles) {
+			if ( a.getAttribute("data-template") != "none" ) {
-          articles.forEach(function (article) {
+				const observer = new IntersectionObserver(articles => {
-            var a = article.target;
+					articles.forEach(article => {
+						let a = article.target;
+
+						// console.log("observing: ", { id: a.getAttribute("id"), intersecting: a.isIntersecting } )
+						// if (article.intersectionRatio > 0) {
+							// console.log("Is interesecting: ", { id: article.target.getAttribute("id"), intersecting: article.isIntersecting, ratio: article.intersectionRatio } )
+
 						if (article.isIntersecting == true) {
-              var path = a.getAttribute("data-path");
+							let path = a.getAttribute("data-path");
-              path = "patterns/" + (a.getAttribute("data-core") == "true" ? "core/" + path.substring(path.lastIndexOf("/") + 1) : a.getAttribute("data-path")) + "/index.html";
+							path = "patterns/" + 
-              var ASYNC = true;
+							 		(a.getAttribute("data-core") == "true" ? 
-              var ajx = new XMLHttpRequest();
+							 		"core/" + path.substring(path.lastIndexOf("/") + 1) : 
-              ajx.onreadystatechange = function () {
+							 		a.getAttribute("data-path")) 
+							 		+ "/index.html";
+							const ASYNC = true;
+							let ajx = new XMLHttpRequest();
+							ajx.onreadystatechange = () => {
 								if (ajx.readyState == 4) {
 									observer.unobserve(article.target);								
 									switch (ajx.status) {
 										case 200: 
 											a.innerHTML = a.innerHTML + ajx.responseText;
-                      a.style.height = "auto";
+											a.style.height = "auto"
 											switch (a.getAttribute("data-template")) {
 											 	case "pug": 
-                          a.querySelectorAll("pre").forEach(function (aa) {
+											 		a.querySelectorAll("pre").forEach((aa) => {
-                            aa.innerHTML = "<code class=\"".concat(aa.getAttribute("class"), "\">").concat(aa.innerHTML, "</code>");
+											 			aa.innerHTML = `<code class="${aa.getAttribute("class")}">${aa.innerHTML}</code>`;
-                          });
+											 		})
 											 	break;
 											 	case "md": 
-                          a.querySelectorAll("code").forEach(function (aa) {
+											 		a.querySelectorAll("code").forEach((aa) => {
 											 			aa.classList.add("language-html");
-                          });
+											 		})
 											 	break;
 											}
-                      a.querySelectorAll("code").forEach(function (c) {
+
+											a.querySelectorAll("code").forEach((c)=> {
 												c.classList.add("line-numbers");
 												c.innerHTML = c.innerHTML.replace(/</g, "&lt;");
 												c.classList.add("copy-to-clipboard-button");
-                      });
+											})
 											if (typeof args.success == "function") args.success(a);
+
 											Prism.highlightAll();
-                      a.querySelectorAll("code").forEach(function (c) {
+
-                        c.onclick = function (e) {
+											a.querySelectorAll("code").forEach((c)=> {
-                          module.exports.oneClickSelect(e);
+												c.onclick = (e) => {
-                        };
+													oneClickSelect(e);
-                      });
+												}
+											})
+
+
 											module.exports.colour.positionTooltip();
-                      window.onresize = function () {
+											window.onresize = () => {
 												module.exports.colour.positionTooltip();
-                      };
+											}
-                      a.querySelectorAll("name > span, color-pill > span").forEach(function (pill) {
+
-                        pill.onclick = function (e) {
+											a.querySelectorAll("name > span, color-pill > span").forEach((pill) => {
+												pill.onclick = (e) => {
 													e.preventDefault();
-                          var w = "";
+													let w = "";
 													if (e.metaKey || e.ctrlKey || e.keyCode == 91 || e.keyCode == 224) {
 														w = "var";
 													} else if (e.altKey) {
-                            w = "token";
+														w = "token"
 													} else if (e.shiftKey) {
 														w = "rgb";
 													} else {
 														w = "hex";
 													}
 													module.exports.colour.copy(w, pill);
-                        };
+												}
-                      });
+											})
 										break;
+
 										case 404: 
 											if (typeof args.notFound == "function") args.notFound(a, path);
 										break;
+
 										default:
-                      console.log("uncaught http error", {
+											console.log("uncaught http error", { status: ajx.status, path: a.getAttribute("data-path") });
-                        status: ajx.status,
-                        path: a.getAttribute("data-path")
-                      });
 									}
+
 									a.style.height = "auto";
+									
 									if (typeof args.done == "function") args.done(a);
+
 								}
 							};
 							ajx.open("GET", path, ASYNC);
 							ajx.send();
+
 						}
-          });
+					})
-        }, {
+				}, { threshold: 0, rootMargin: "100%" })
-          threshold: 0,
+
-          rootMargin: "100%"
-        });
 				observer.observe(a);
+
 			} else {
 				a.style.height = "auto";
 			}
-    });
+		})
+
 		if (typeof args.afterArticleLoad == "function") args.afterArticleLoad();
 	}
 };
@@ -3021,47 +3013,45 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   init: function() { return /* binding */ init; }
 /* harmony export */ });
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 //-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
-var font = {
+const font = {
 	size: 0
-};
+}
-var pos = {
+
+const pos = {
 	x: 0,
 	y: 0
-};
+}
+
 function drag(sticky) {
-  sticky.onmousedown = function (event) {
+	sticky.onmousedown = event => {
 		// get the position within the sticky
-    pos.x = event.clientX - sticky.offsetLeft;
+		pos.x = (event.clientX - sticky.offsetLeft);
-    pos.y = event.clientY - sticky.offsetTop;
+		pos.y = (event.clientY - sticky.offsetTop);
 
 		// on mouse move, move the sticky to the position, minus the offset, of the mouse
-    document.onmousemove = function (documentEvent) {
+		document.onmousemove = documentEvent => {
-      sticky.style.top = documentEvent.clientY - pos.y + 'px';
+			sticky.style.top = (documentEvent.clientY - pos.y) + 'px';
-      sticky.style.left = documentEvent.clientX - pos.x + 'px';
+			sticky.style.left = (documentEvent.clientX - pos.x) + 'px';
 			sticky.setAttribute("moved", "true");
-    };
+		}
 		// when done, remove mouse move and mouse up handlers. 
-    document.onmouseup = function () {
+		document.onmouseup = () => {
 			document.onmouseup = null;
 			document.onmousemove = null;
-    };
+		}
-  };
+	}
 }
+
 function waitForElement(selector) {
-  return new Promise(function (resolve) {
+    return new Promise(resolve => {
         if (document.querySelector(selector)) {
             return resolve(document.querySelector(selector));
         }
-    var observer = new MutationObserver(function (mutations) {
+
+        const observer = new MutationObserver(mutations => {
             if (document.querySelector(selector)) {
                 observer.disconnect();
                 resolve(document.querySelector(selector));
@@ -3075,81 +3065,84 @@ function waitForElement(selector) {
         });
     });
 }
-var checkBottom = function checkBottom(attach) {
+
+const checkBottom = (attach) => {
 	// check if top or bottom
 	if (attach.y < 0) { 
 		attach.ys = "bottom";
 		attach.y = attach.y * -1;
 	}
-};
+}
-var setStickyPostions = function setStickyPostions(s, attach) {
+
+const setStickyPostions = (s, attach) => {
 		// set 
-  s.style[attach.ys] = "".concat(attach.y, "px");
+		s.style[attach.ys] = `${attach.y}px`;
-  s.style[attach.xs] = "".concat(attach.x, "px");
+		s.style[attach.xs] = `${attach.x}px`;
 		s.style.display = "grid";
-};
+}
-var css = function css(el, attr) {
+
-  var st = "";
+const css = (el, attr) => {
-  Object.entries(attr).forEach(function (val) {
+	let st = ""
-    var _val = _slicedToArray(val, 2),
+	Object.entries(attr).forEach(val => {
-      key = _val[0],
+		const [key, value] = val;
-      value = _val[1];
+  		st += `${key}: ${value}; `;
-    st += "".concat(key, ": ").concat(value, "; ");
+	})
-  });
+  	el.setAttribute("style",st.trim());
-  el.setAttribute("style", st.trim());
+}
-};
+
-var calculateStickyPosition = function calculateStickyPosition(s) {
+
-  var float = s.getAttribute("float");
+const calculateStickyPosition = (s) => {
-  var p = s.parentNode.getBoundingClientRect();
+	let float = s.getAttribute("float");
+	let p = s.parentNode.getBoundingClientRect()
 	switch (float) {
 		case "left": 
-      css(s, {
+			css(s, {left: (p.left * -1) + "px"})
-        left: p.left * -1 + "px"
-      });
 			break;
 		case "right":
-      css(s, {
+			css(s, { left: (Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0) - p.left - s.offsetWidth - (font.size * 2)) + "px" }); 
-        left: Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0) - p.left - s.offsetWidth - font.size * 2 + "px"
-      });
 			break;
 	} 
-  var offset = s.getAttribute("offset");
+
+	let offset = s.getAttribute("offset");
 	if (offset !== null) {
 		offset = offset.trim().split(" ");
-    css(s, {
+		css(s, {top: offset[0], left: offset[1] })
-      top: offset[0],
-      left: offset[1]
-    });
 	}
-};
+}
-function init() {
+
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document;
+function init(p = document){
-  font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px", ""));
+	font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px",""));
-  p.querySelectorAll("sticky-note").forEach(function (s) {
+
+	p.querySelectorAll("sticky-note").forEach((s) => {
 		if (s.querySelectorAll("svg").length == 0) {
-      var wrapper = document.createElement("sticky-note-wrapper");
+			
+			let wrapper = document.createElement("sticky-note-wrapper");
+
 			s.parentNode.insertBefore(wrapper, s);
     		wrapper.appendChild(s);
+
 			s.setAttribute("content", s.innerHTML.replace(/"/g, "\""));
-      s.innerHTML = "<div><svg width='0' height='0'><defs><clipPath id='stickyClip' clipPathUnits='objectBoundingBox'><path d='M 0 0 Q 0 0.69, 0.03 0.96 0.03 0.96, 1 0.96 Q 0.96 0.69, 0.96 0 0.96 0, 0 0' stroke-linejoin='round' stroke-linecap='square' /></clipPath></defs></svg></div><div><div>".concat(s.innerHTML, "</div></div>");
+			s.innerHTML = `<div><svg width='0' height='0'><defs><clipPath id='stickyClip' clipPathUnits='objectBoundingBox'><path d='M 0 0 Q 0 0.69, 0.03 0.96 0.03 0.96, 1 0.96 Q 0.96 0.69, 0.96 0 0.96 0, 0 0' stroke-linejoin='round' stroke-linecap='square' /></clipPath></defs></svg></div><div><div>${s.innerHTML}</div></div>`;
 		}
 		calculateStickyPosition(s);
 		drag(s);
-    s.ondblclick = function (e) {
+		s.ondblclick = (e) => {
 			if (e.ctrlKey) {
 				calculateStickyPosition(s);
 			} else {
 				// add one click select
 			}
-    };
+		}
-  });
+	})
-  window.onresize = function () {
+
-    font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px", ""));
+
-    var stickies = p.querySelectorAll("sticky-note");
+	window.onresize = () => {
-    stickies.forEach(function (s) {
+		font.size = parseFloat(getComputedStyle(document.documentElement).fontSize.replace("px",""));
+		let stickies = p.querySelectorAll("sticky-note");
+		stickies.forEach((s) => {
 			calculateStickyPosition(s);
 		});
-  };
+	}
 }
 
 /***/ }),
@@ -3160,8 +3153,8 @@ function init() {
 //-		Licensed under CC BY-SA 4.0 
 
 function flip(e) {
-  var sw = e.currentTarget;
+	let sw = e.currentTarget;
-  switch (sw.getAttribute("aria-checked")) {
+	switch(sw.getAttribute("aria-checked")) {
 		case "true": 
 			sw.setAttribute("aria-checked", "false");
 		break;
@@ -3169,24 +3162,20 @@ function flip(e) {
 			sw.setAttribute("aria-checked", "true");
 		break;
 	}
-}
+};
-;
+
 module.exports = {
-  init: function init() {
+	init: (p = document) => {
-    var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document;
+		p.querySelectorAll("[role='switch']").forEach((sw) => {
-    try {
-      p.querySelectorAll("[role='switch']").forEach(function (sw) {
 			sw.innerHTML = "<span></span>";
 			sw.setAttribute("aria-checked", "false");
 			sw.setAttribute("tabindex", "0");
 			sw.addEventListener("click", flip, false);
 			sw.addEventListener("keypress", flip, false);
-      });
+		})
-    } catch (e) {
-      console.warn("Cannot initialise switches.", e);
 	}
-  }
+}
-};
+
 
 /***/ }),
 /* 10 */
@@ -3198,104 +3187,60 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   init: function() { return /* binding */ init; }
 /* harmony export */ });
 /*  DS2 core (c) 2024 Alexander McIlwraith 
-	Released under Creative Commons Attribution-ShareAlike 4.0 International
+	import * as tabs from "../pg/patterns/layouts/tabs/_tabs.js";
+	tabs.init();
  */
 
-// create a pure JS mouse click event
+function init(p = document) { 
-var click = new MouseEvent('click', {
+	p.querySelectorAll(".tab-group, tabset").forEach(tabGroup => {
-  view: window,
-  bubbles: false,
-  cancelable: true
-});
-var waitForElement = function waitForElement(selector) {
-  return new Promise(function (resolve) {
-    if (document.querySelector(selector)) {
-      return resolve(document.querySelector(selector));
-    }
-    var observer = new MutationObserver(function (mutations) {
-      if (document.querySelector(selector)) {
-        observer.disconnect();
-        resolve(document.querySelector(selector));
-      }
-    });
 
-    // If you get "parameter 1 is not of type 'Node'" error, see https://stackoverflow.com/a/77855838/492336
-    observer.observe(document.body, {
-      childList: true,
-      subtree: true
-    });
-  });
-};
-function init() {
-  var container = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document;
-  var spacer = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var args = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  container.querySelectorAll(".tab-group, tabset").forEach(function (tabGroup) {
 		if (tabGroup.querySelector("[role=tablist]") === null) {
-      var tabgroup = tabGroup.getAttribute("id");
+			const tabgroup = tabGroup.getAttribute("id");
-      var tablist = "";
+			let tablist = "";
-      Array.from(tabGroup.children).forEach(function (child) {
+
-        var tab = child.getAttribute("tab") || child.getAttribute("data-tab");
+			Array.from(tabGroup.children).forEach(child => {
+				const tab = child.getAttribute("tab") || child.getAttribute("data-tab");
 				if (tab !== null) {
-          var tabID = tab.replace(/\W+/g, "-").toLowerCase();
+					const tabID = tab.replace(/\W+/g, "-").toLowerCase();
-          var tabPanel = document.createElement('div');
+					const tabPanel = document.createElement('div');
-          tabPanel.id = "tab-panel-".concat(tabgroup, "-").concat(tabID);
+					tabPanel.id = `tab-panel-${tabgroup}-${tabID}`;
 					tabPanel.className = tablist === "" ? "open" : "";
 					tabPanel.setAttribute("role", "tabpanel");
 					tabPanel.setAttribute("tabindex", "0");
-          tabPanel.setAttribute("aria-labelledby", "tab-".concat(tabgroup, "-").concat(tabID));
+					tabPanel.setAttribute("aria-labelledby", `tab-${tabgroup}-${tabID}`);
 					tabPanel.appendChild(child.cloneNode(true));
 					child.parentNode.replaceChild(tabPanel, child);
-          tablist += "<li tabindex=\"0\" role=\"tab\" ".concat(tablist === "" ? "class='selected'" : "", " id=\"tab-").concat(tabgroup, "-").concat(tabID, "\"><span>").concat(tab, "</span></li>");
+					tablist += `<li tabindex="0" role="tab" ${tablist === "" ? "class='selected'" : ""} id="tab-${tabgroup}-${tabID}"><span>${tab}</span></li>`;
 				} else {
 					child.classList.add("tab-hidden");
 				}
 			});
-      var ul = document.createElement('ul');
+
+			const ul = document.createElement('ul');
 			ul.setAttribute("role", "tablist");
-      ul.innerHTML = spacer != true ? "".concat(tablist) : "".concat(tablist, "<li role=\"separator\" class=\"separator\"></li>");
+			ul.innerHTML = `${tablist}<li role="separator" class="separator"></li>`;
 			tabGroup.insertBefore(ul, tabGroup.firstChild);
-      tabGroup.querySelectorAll('[role="tab"]').forEach(function (tab) {
+
-        tab.addEventListener("click", function (e) {
+			tabGroup.querySelectorAll('[role="tab"]').forEach(tab => {
-          if (e.altKey && typeof args.altModifier == "function") {
+				tab.addEventListener("click", () => {
-            args.altModifier(tab);
+					const siblings = Array.from(tab.parentNode.children);
-          } else if (e.shiftKey && typeof args.shiftModifier == "function") {
+					siblings.forEach(sibling => sibling.classList.remove("selected"));
-            args.shiftModifier(tab);
-          } else if (e.metaKey && typeof args.metaModifier == "function") {
-            args.metaModifier(tab);
-          } else {
-            var siblings = Array.from(tab.parentNode.children);
-            siblings.forEach(function (sibling) {
-              return sibling.classList.remove("selected");
-            });
 					tab.classList.add("selected");
-            var tabPanels = Array.from(tab.parentNode.parentNode.children).filter(function (child) {
+
-              return child.getAttribute("role") === "tabpanel";
+					const tabPanels = Array.from(tab.parentNode.parentNode.children)
-            });
+										   .filter(child => child.getAttribute("role") === "tabpanel");
-            tabPanels.forEach(function (panel) {
+					tabPanels.forEach(panel => panel.classList.remove("open"));
-              return panel.classList.remove("open");
+
-            });
+					const tabPanelId = tab.getAttribute("id").replace("tab", "tab-panel");
-            var tabPanelId = tab.getAttribute("id").replace("tab", "tab-panel");
 					document.getElementById(tabPanelId).classList.add("open");
-          }
-        });
-        tab.addEventListener("keypress", function (e) {
-          e.preventDefault();
-          if (e.which == 32 || e.which == 13) {
-            e.currentTarget.dispatchEvent(click);
-          }
 				});
 			});
-    }
+			
-    if (document.location.hash != "" && document.location.hash.substring(0, 5) == "#tab-") {
-      waitForElement(document.location.hash).then(function (el) {
-        el.scrollIntoView();
-        el.dispatchEvent(click);
-      });
 		}
 	});
 }
 
+
 /***/ })
 /******/ 	]);
 /************************************************************************/
@@ -3414,49 +3359,56 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-// init c
+// init core
 _core_core_js__WEBPACK_IMPORTED_MODULE_0__.init({
-  success: function success(a) {
+	success: (a) => { 
-    _pg_patterns_core_tabs_tabs_js__WEBPACK_IMPORTED_MODULE_9__.init(a, true, {
+		_pg_patterns_core_tabs_tabs_js__WEBPACK_IMPORTED_MODULE_9__.init(a);
-      shiftModifier: _core_core_js__WEBPACK_IMPORTED_MODULE_0__.getTabPath
-    });
 		_pg_patterns_core_switch_switch_js__WEBPACK_IMPORTED_MODULE_8__.init(a);
 		_pg_patterns_core_sticky_note_sticky_note_js__WEBPACK_IMPORTED_MODULE_7__.init(a);
 	},
-  notFound: function notFound(a, path) {
+	notFound: (a, path) => {
-    a.innerHTML = "".concat(a.innerHTML, "<div class='notification-box error'><p>This pattern appears to be missing.<br><small>(").concat(path, " returned http status 404)</small></p></div>");
+		a.innerHTML = `${a.innerHTML}<div class='notification-box error'><p>This pattern appears to be missing.<br><small>(${path} returned http status 404)</small></p></div>`;
 	}
 });
 
+
+
+
 // deprecated switch handler
-var flipInfoSwitch = function flipInfoSwitch(e) {
+const flipInfoSwitch = (e, s = e.currentTarget) => {
-  var s = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : e.currentTarget;
+	
-  switch (s.getAttribute("id")) {
+	switch(s.getAttribute("id")) {
-    case "deprecated":
+
+		case "deprecated" : 
 			_core_core_js__WEBPACK_IMPORTED_MODULE_0__.cookie.set("show-deprecated", s.getAttribute("aria-checked"), 30, "/");
-      document.querySelector("main").querySelectorAll("article[data-status=deprecated]").forEach(function (a) {
+			document.querySelector("main").querySelectorAll("article[data-status=deprecated]").forEach((a) => {
-        a.classList[s.getAttribute("aria-checked") == "true" ? "add" : "remove"]("show-deprecated");
+				a.classList[( s.getAttribute("aria-checked") == "true" ? "add" : "remove" )]("show-deprecated");
 			});
 		break; 
-    case "breakpoints":
+
+		case "breakpoints" :
+			console.log("here")
 			_core_core_js__WEBPACK_IMPORTED_MODULE_0__.cookie.set("show-breakpoints", s.getAttribute("aria-checked"), 30, "/");
-      document.querySelector("html").classList[s.getAttribute("aria-checked") == "true" ? "add" : "remove"]("show-breakpoints");
+			document.querySelector("html").classList[( s.getAttribute("aria-checked") == "true" ? "add" : "remove" )]("show-breakpoints");
 		break; 
 	}
-};
+
+}
 
 // create a pure JS mouse click event
-var click = new MouseEvent('click', {
+const click = new MouseEvent('click', {
 	view: window,
 	bubbles: false,
 	cancelable: true
 });
 
 // get the switch, initialize it and add the handler
-var switches = document.querySelector(".info-switches");
+let switches = document.querySelector(".info-switches");
 _pg_patterns_core_switch_switch_js__WEBPACK_IMPORTED_MODULE_8__.init(switches);
-var deprecated = document.querySelector("#deprecated");
+
-var breakpoints = document.querySelector("#breakpoints");
+let deprecated = document.querySelector("#deprecated");
+let breakpoints = document.querySelector("#breakpoints");
+
 deprecated.onclick = flipInfoSwitch;
 deprecated.keypress = flipInfoSwitch;
 breakpoints.onclick = flipInfoSwitch;
@@ -3472,6 +3424,7 @@ if (_core_core_js__WEBPACK_IMPORTED_MODULE_0__.cookie.get("show-breakpoints") ==
 
 // just for fun... We'll show deprecated if they match the path
 // document.querySelector(`#${core.url.p.replace(/\//g, "-")}`).classList.add("show-deprecated");
+
 }();
 /******/ })()
 ;

public/patterns/core/breakpoints/index.html

@@ -12,17 +12,11 @@
     <h2>How to use it</h2>
     <p>This pattern is only available for SCSS breakpoints. The  mixin is avai</p>
     <p>When using this, use the default break points as they are set to the same as the Bootstrap framework. The grid for the design system at large break point has been widened to accompdate 3 colour cards across. </p>
-    <tabset id="breakpoints">
+    <div class="tab-group" id="breakpoints">
-      <div tab="scss">
+      <pre class="language-css" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
-        <pre class="language-sass">@import "[path-to]/breakpoints";
-@include break([breakpoint]) {
-	// css here
-}</pre>
-        <pre class="language-sass">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
-// default breakpoints match bootstrap 5 breakpoints.
+$grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px ) !default;
-$grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1400px ) !default;
 
 @mixin breakpoint-debug {
 	body::before, body::after {
@@ -106,6 +100,5 @@ $grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 14
 	}
 }</pre>
     </div>
-    </tabset>
   </body>
 </html>

public/patterns/core/colours/index.html

@@ -287,23 +287,23 @@
         <div class="tab-group" id="colors">
           <div data-tab="css">
             <pre class="language-css">:root {
-	--colour-blue: #2e51a1;
+	--colour-blue: #2e51a1,
-	--colour-blue-l: #5c7abf;
+	--colour-blue-l: #5c7abf,
-	--colour-blue-xl: #b2c3ec;
+	--colour-blue-xl: #b2c3ec,
-	--colour-blue-d: #133176;
+	--colour-blue-d: #133176,
-	--colour-blue-xd: #031235;
+	--colour-blue-xd: #031235,
 
-	--colour-grey: #7f7f7f;
+	--colour-grey: #7f7f7f,
-	--colour-grey-l: #b2b2b2;
+	--colour-grey-l: #b2b2b2,
-	--colour-grey-xl: #d8d8d8;
+	--colour-grey-xl: #d8d8d8,
-	--colour-grey-xxl: #f0f0f0;
+	--colour-grey-xxl: #f0f0f0,
-	--colour-white: #fff;
+	--colour-white: #fff,
-	--colour-page: #fff;
+	--colour-page: #fff,
-	--colour-light: #fff;
+	--colour-light: #fff,
-	--colour-grey-d: #4c4c4c;
+	--colour-grey-d: #4c4c4c,
-	--colour-grey-xd: #4c4c4c;
+	--colour-grey-xd: #4c4c4c,
-	--colour-black: #000;
+	--colour-black: #000,
-	--colour-dark: #000;
+	--colour-dark: #000,
 }</pre>
           </div>
           <div data-tab="scss">

public/patterns/core/header/index.html

@@ -9,9 +9,9 @@
     <h2>When to use it</h2>
     <p>Use a header at the top of every page. The 'front page' of a site may have a different header than the rest of the pages. </p>
     <h2>How to use it</h2>
-    <p>Place the header at the top of the page after the skip to main content link. You will likely want to replace core header should be replaced with your own site's header. To do this, remove the <code class="inline language-js">core: true </code> and create your own pattern in the location you wish it in your design system. </p>
+    <p>Place the header at the top of the page after the skip to main content link. This basic header should be replaced with your own site's header. </p>
-    <tabset id="header">
+    <div class="tab-group" id="header">
-      <pre class="language-html" tab="html">
+      <pre class="language-html" data-tab="html">
         <!-- create temp variables and store the design system values-->
         <header>
           <!-- The headline banner area -->
@@ -25,7 +25,20 @@
             <!-- Other sections can go here, such as search and directory-->
           </div>
         </header></pre>
-      <pre class="language-pug" tab="pug">//-		DS2 core (c) 2024 Alexander McIlwraith 
+      <pre class="language-html" data-tab="html">
+        <header>
+          <!-- The headline banner area -->
+          <svg height="5.5rem" width="100%" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+            <text>DS2 core</text>
+          </svg>
+          <div>
+            <div class="header-title">
+              <h1> <a href="./">DS2 core</a></h1>
+            </div>
+            <!-- Other sections can go here, such as search and directory-->
+          </div>
+        </header></pre>
+      <pre class="language-pug" data-tab="pug">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 //- required variables
@@ -42,11 +55,60 @@ header
 				a(href="./")= site
 		// Other sections can go here, such as search and directory
 </pre>
-      <pre class="language-css" tab="css">header{display:-ms-grid;display:grid;-ms-grid-rows:1.75rem 3.5rem;grid-template-rows:1.75rem 3.5rem;-ms-grid-column:2;-ms-grid-column-span:2;grid-column:2/4;overflow:hidden}header svg{grid-column:1/-1;grid-row:1/-1;-ms-grid-row-align:stretch;-ms-grid-column-align:stretch;place-self:stretch}header svg text{-webkit-transform:translate(-1rem,7.25rem);-ms-transform:translate(-1rem,7.25rem);transform:translate(-1rem,7.25rem);font-size:10rem;font-weight:1000;font-family:sans-serif;fill:var(--colour-grey-xxl)}header>div{-ms-grid-row:2;grid-row:2;grid-column:1/-1;display:-ms-grid;display:grid;grid-column-gap:1rem;-ms-grid-columns:auto -webkit-max-content -webkit-max-content;-ms-grid-columns:auto max-content max-content;grid-template-columns:auto -webkit-max-content -webkit-max-content;grid-template-columns:auto max-content max-content}header>div .header-title h1{margin:0;padding:0 1rem}header>div .header-title h1 a,header>div .header-title h1 a:visited{border-bottom:none;color:var(--colour-black);font-family:sans-serif;font-size:2.5rem;font-size:32px;font-weight:700;margin:0;padding:0;text-decoration:none}</pre>
+      <pre class="language-css" data-tab="css">header {
-      <div class="language-sass" tab="scss">
+	display: -ms-grid;
-        <pre class="language-sass">@import "scss/core/header/header;
+	display: grid;
-</pre>
+	-ms-grid-rows: 1.75rem 3.5rem;
-        <pre class="language-sass">//-		DS2 core (c) 2024 Alexander McIlwraith 
+	grid-template-rows: 1.75rem 3.5rem;
+	-ms-grid-column: 2;
+	-ms-grid-column-span: 2;
+	grid-column: 2/4;
+	overflow: hidden;
+}
+header svg {
+	grid-column: 1/-1;
+	grid-row: 1/-1;
+	-ms-grid-row-align: stretch;
+	-ms-grid-column-align: stretch;
+	place-self: stretch;
+}
+header svg text {
+	-webkit-transform: translate(-1rem, 7.25rem);
+	    -ms-transform: translate(-1rem, 7.25rem);
+	        transform: translate(-1rem, 7.25rem);
+	font-size: 10rem;
+	font-weight: 1000;
+	font-family: sans-serif;
+	fill: var(--colour-grey-xxl);
+}
+header > div {
+	-ms-grid-row: 2;
+	grid-row: 2;
+	grid-column: 1/-1;
+	display: -ms-grid;
+	display: grid;
+	grid-column-gap: 1rem;
+	-ms-grid-columns: auto -webkit-max-content -webkit-max-content;
+	-ms-grid-columns: auto max-content max-content;
+	grid-template-columns: auto -webkit-max-content -webkit-max-content;
+	grid-template-columns: auto max-content max-content;
+}
+header > div .header-title h1 {
+	margin: 0;
+	padding: 0 1rem;
+}
+header > div .header-title h1 a, header > div .header-title h1 a:visited {
+	border-bottom: none;
+	color: var(--colour-black);
+	font-family: sans-serif;
+	font-size: 2.5rem;
+	font-size: 32px;
+	font-weight: 700;
+	margin: 0;
+	padding: 0;
+	text-decoration: none;
+}</pre>
+      <pre class="language-sass" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 $header-bg-color: var(--colour-grey-xxl) !default;
@@ -101,6 +163,5 @@ $font-weight: 700 !default;
 	}
 }</pre>
     </div>
-    </tabset>
   </body>
 </html>

public/patterns/core/sticky-note/index.html

@@ -9,23 +9,143 @@
     <h2>When to use it</h2>
     <p>Use a sticky when you want to make a note without adding it to the content. </p>
     <h2>How to use it</h2>
-    <p>Uses absolute positioning. Passing an optional element to the init function will initialise tabs within that element. You can move the position using either <code class="language-html inline">float="&#91; right | left &#93;"</code> or <code class="language-html inline">offset="&#91; top | left &#93;"</code>. Offset will take negative values in any web measurement unit.
+    <p>Uses absolute positioning. 
-      <sticky-note class="blue" offset="-10rem 1rem">This <strong>is</strong> a sample sticky. You can drag it out of the way if you need to see the content under it.</sticky-note>
+      <sticky-note class="blue" float="right">This <strong>is</strong> a sample sticky. You can drag it out of the way if you need to see the content under it.</sticky-note>
-      <sticky-note float="right">You will notice when you hover over the sticky, it shows a dot in the colour of the sticky in the position where the sticky note refers to (assuming you haven't dragged it and scrolled that location off the screen).</sticky-note>
     </p>
     <p>If you wish to create a custom element, that extends another HTML element, the native element has to be extended in customElements.define(). Custom elements that inherit native elements are also known as "type extension custom elements". 	</p>
+    <sticky-note>You will notice when you hover over the sticky, it shows a dot in the colour of the sticky in the position where the sticky note refers to (assuming you haven't dragged it and scrolled that location off the screen).</sticky-note>
     <tabset id="sticky-note">
       <pre class="language-html" tab="html">
         <sticky-note class="blue" float="right">This <strong>is</strong> a sample sticky. You can drag it out of the way if you need to see the content under it.</sticky-note></pre>
       <pre class="language-pug" tab="pug">sticky-note(float="right").blue This #[strong is] a sample sticky. 
 	| You can drag it out of the way if you need to see the content under it.</pre>
-      <pre class="language-css" data-tab="css"> @import url("https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap");sticky-note-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;border:1px solid transparent;border-radius:50%;display:inline-block;height:0.5rem;position:relative;width:0.5rem}sticky-note-wrapper *{-webkit-box-sizing:border-box;box-sizing:border-box}sticky-note-wrapper sticky-note{cursor:-webkit-grab;cursor:grab;display:-ms-grid;display:grid;float:left;font-size:1rem;height:13rem;left:0;place-items:stretch;position:absolute;top:0;width:13rem;z-index:100}sticky-note-wrapper sticky-note:active{cursor:-webkit-grabbing;cursor:grabbing;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}sticky-note-wrapper sticky-note.right{float:right}sticky-note-wrapper sticky-note>div{-ms-grid-row:1;grid-row:1;-ms-grid-column:1;grid-column:1}sticky-note-wrapper sticky-note>div:first-child{background-color:rgba(0,0,0,0.25);-webkit-box-shadow:-2px 2px 15px 0 rgba(0,0,0,0.5);box-shadow:-2px 2px 15px 0 rgba(0,0,0,0.5);display:-ms-grid;display:grid;margin:2rem 1rem 0.25rem 0.36rem;width:calc(100% - 1rem)}sticky-note-wrapper sticky-note>div:nth-child(2){clip-path:url(#stickyClip);display:-ms-grid;display:grid;font-family:"Kalam",cursive;font-style:1rem;font-weight:300;line-height:1.25rem;padding:1rem;place-items:center;text-align:center}sticky-note-wrapper sticky-note>div:nth-child(2)>*{font-family:"Kalam",cursive!important;font-style:normal!important;font-weight:300!important}@media screen and (max-width:1024px){sticky-note-wrapper sticky-note>div:nth-child(2){max-width:13rem;min-width:13rem;width:1rem}}@media screen and (max-width:768px){sticky-note-wrapper sticky-note>div:nth-child(2){font-size:1.75rem;max-width:21rem;min-height:21rem}}@media screen and (max-width:640px){sticky-note-wrapper sticky-note>div:nth-child(2){font-size:2.5rem;max-width:26rem;min-height:26rem}}sticky-note-wrapper sticky-note>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#ffffdd),color-stop(2%,#ffffd3),color-stop(12%,#ffffd3),color-stop(75%,#ffffc9),to(#ffffba));background:linear-gradient(180deg,#ffffdd 0%,#ffffd3 2%,#ffffd3 12%,#ffffc9 75%,#ffffba 100%)}sticky-note-wrapper sticky-note.blue>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#9dddec),color-stop(2%,#94daea),color-stop(12%,#94daea),color-stop(75%,#8bd7e8),to(#7fd3e6));background:linear-gradient(180deg,#9dddec 0%,#94daea 2%,#94daea 12%,#8bd7e8 75%,#7fd3e6 100%)}sticky-note-wrapper sticky-note.pink>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#fa7c93),color-stop(2%,#fa728b),color-stop(12%,#fa728b),color-stop(75%,#fa6883),to(#f95977));background:linear-gradient(180deg,#fa7c93 0%,#fa728b 2%,#fa728b 12%,#fa6883 75%,#f95977 100%)}sticky-note-wrapper sticky-note.green>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#c5fcc9),color-stop(2%,#bbfbc0),color-stop(12%,#bbfbc0),color-stop(75%,#b1fab7),to(#a3faaa));background:linear-gradient(180deg,#c5fcc9 0%,#bbfbc0 2%,#bbfbc0 12%,#b1fab7 75%,#a3faaa 100%)}sticky-note-wrapper:has(sticky-note:hover){background-color:#ffffd3;border:1px solid black}sticky-note-wrapper:has(sticky-note.yellow:hover){background-color:#ffffd3}sticky-note-wrapper:has(sticky-note.blue:hover){background-color:#94daea}sticky-note-wrapper:has(sticky-note.pink:hover){background-color:#fa728b}sticky-note-wrapper:has(sticky-note.green:hover){background-color:#bbfbc0}</pre>
+      <pre class="language-css" data-tab="css"> @import url("https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap");
-      <div tab="scss"> 
+sticky-note-wrapper {
-        <pre class="language-sass">$sticky-colors: ( [sass map with your own defined colours] );
+	-webkit-box-sizing: border-box;
-@import "scss/core/switch/_sticky-note";
+	        box-sizing: border-box;
-@include sticky-note;
+	border: 1px solid transparent;
-</pre>
+	border-radius: 50%;
-        <pre class="language-sass">//-		DS2 core (c) 2024 Alexander McIlwraith 
+	display: inline-block;
+	height: 0.5rem;
+	position: relative;
+	width: 0.5rem;
+}
+sticky-note-wrapper * {
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+sticky-note-wrapper sticky-note {
+	cursor: -webkit-grab;
+	cursor: grab;
+	display: -ms-grid;
+	display: grid;
+	float: left;
+	font-size: 1rem;
+	height: 13rem;
+	left: 0;
+	place-items: stretch;
+	position: absolute;
+	top: 0;
+	width: 13rem;
+	z-index: 100;
+}
+sticky-note-wrapper sticky-note:active {
+	cursor: -webkit-grabbing;
+	cursor: grabbing;
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	    -ms-user-select: none;
+	        user-select: none;
+}
+sticky-note-wrapper sticky-note.right {
+	float: right;
+}
+sticky-note-wrapper sticky-note > div {
+	-ms-grid-row: 1;
+	grid-row: 1;
+	-ms-grid-column: 1;
+	grid-column: 1;
+}
+sticky-note-wrapper sticky-note > div:nth-child(1) {
+	background-color: rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: -2px 2px 15px 0 rgba(0, 0, 0, 0.5);
+	        box-shadow: -2px 2px 15px 0 rgba(0, 0, 0, 0.5);
+	display: -ms-grid;
+	display: grid;
+	margin: 2rem 1rem 0.25rem 0.36rem;
+	width: calc(100% - 1rem);
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) {
+	clip-path: url(#stickyClip);
+	display: -ms-grid;
+	display: grid;
+	font-family: "Kalam", cursive;
+	font-style: 1rem;
+	font-weight: 300;
+	line-height: 1.25rem;
+	padding: 1rem;
+	place-items: center;
+	text-align: center;
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) > * {
+	font-family: "Kalam", cursive !important;
+	font-style: normal !important;
+	font-weight: 300 !important;
+}
+@media screen and (max-width: 1024px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		max-width: 13rem;
+		min-width: 13rem;
+		width: 1rem;
+	}
+}
+@media screen and (max-width: 768px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		font-size: 1.75rem;
+		max-width: 21rem;
+		min-height: 21rem;
+	}
+}
+@media screen and (max-width: 640px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		font-size: 2.5rem;
+		max-width: 26rem;
+		min-height: 26rem;
+	}
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#ffffdd), color-stop(2%, #ffffd3), color-stop(12%, #ffffd3), color-stop(75%, #ffffc9), to(#ffffba));
+	background: linear-gradient(180deg, #ffffdd 0%, #ffffd3 2%, #ffffd3 12%, #ffffc9 75%, #ffffba 100%);
+}
+sticky-note-wrapper sticky-note.blue > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#9dddec), color-stop(2%, #94daea), color-stop(12%, #94daea), color-stop(75%, #8bd7e8), to(#7fd3e6));
+	background: linear-gradient(180deg, #9dddec 0%, #94daea 2%, #94daea 12%, #8bd7e8 75%, #7fd3e6 100%);
+}
+sticky-note-wrapper sticky-note.pink > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#fa7c93), color-stop(2%, #fa728b), color-stop(12%, #fa728b), color-stop(75%, #fa6883), to(#f95977));
+	background: linear-gradient(180deg, #fa7c93 0%, #fa728b 2%, #fa728b 12%, #fa6883 75%, #f95977 100%);
+}
+sticky-note-wrapper sticky-note.green > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#c5fcc9), color-stop(2%, #bbfbc0), color-stop(12%, #bbfbc0), color-stop(75%, #b1fab7), to(#a3faaa));
+	background: linear-gradient(180deg, #c5fcc9 0%, #bbfbc0 2%, #bbfbc0 12%, #b1fab7 75%, #a3faaa 100%);
+}
+sticky-note-wrapper:has(sticky-note:hover) {
+	background-color: #ffffd3;
+	border: 1px solid black;
+}
+sticky-note-wrapper:has(sticky-note.yellow:hover) {
+	background-color: #ffffd3;
+}
+sticky-note-wrapper:has(sticky-note.blue:hover) {
+	background-color: #94daea;
+}
+sticky-note-wrapper:has(sticky-note.pink:hover) {
+	background-color: #fa728b;
+}
+sticky-note-wrapper:has(sticky-note.green:hover) {
+	background-color: #bbfbc0;
+}</pre>
+      <pre class="language-css" data-tab="scss"> //-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 @use 'sass:color';
@@ -177,12 +297,7 @@ $sticky-colors: (
 		}
 	}
 }</pre>
-      </div>
+      <pre class="language-js" data-tab="js"> //-		DS2 core (c) 2024 Alexander McIlwraith 
-      <div tab="js"> 
-        <pre class="language-js">import * as stickynote from ""./js/core/sticky-note/_sticky-note.js";
-stickynote.init()
-</pre>
-        <pre class="language-js">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 const font = {
@@ -313,7 +428,6 @@ export function init(p = document){
 		});
 	}
 }</pre>
-      </div>
     </tabset>
   </body>
 </html>

public/patterns/core/switch/index.html

@@ -16,14 +16,35 @@
       <label for="example-switch">Switch label (states the on state)</label><span id="example-switch" role="switch"></span>
     </p>
     <div class="tab-group" id="switches">
-      <pre class="language-html" tab="html"><span id="example-id" role="switch"></span></pre>
+      <pre class="language-html" data-tab="html"><span id="example-id" role="switch"></span></pre>
-      <pre class="language-pug" tab="pug">span#example-id(role="switch")</pre>
+      <pre class="language-pug" data-tab="pug">span#example-id(role="switch")</pre>
-      <pre class="language-css" tab="css">[role=switch]{display:-ms-inline-grid;display:inline-grid;border:1px solid #2e51a1;background-color:#d8d8d8;border-radius:0.75rem;height:1.5rem;width:3rem;-webkit-transition:all 500ms;transition:all 500ms}[role=switch]>span{display:inline-block;background-color:white;border-radius:50%;margin:2%;width:calc(1.5rem - 2%);-webkit-transition:all 500ms;transition:all 500ms}[role=switch][aria-checked=true]{background-color:#2e51a1}[role=switch][aria-checked=true]>span{margin-left:calc(1.5rem - 5%)}</pre>
+      <pre class="language-css" data-tab="css">[role=switch] {
-      <div tab="scss">
+	display: -ms-inline-grid;
-        <pre class="language-sass">@import "scss/core/switch/_switch"; 
+	display: inline-grid;
-@include switch;
+	border: 1px solid var(--colour-blue);
-</pre>
+	background-color: var(--colour-grey-xl);
-        <pre class="language-sass">//-		DS2 core (c) 2024 Alexander McIlwraith 
+	border-radius: 0.75rem;
+	height: 1.5rem;
+	width: 3rem;
+	-webkit-transition: all 500ms;
+	transition: all 500ms;
+}
+[role=switch] > span {
+	display: inline-block;
+	background-color: white;
+	border-radius: 50%;
+	margin: 2%;
+	width: calc(1.5rem - 2%);
+	-webkit-transition: all 500ms;
+	transition: all 500ms;
+}
+[role=switch][aria-checked=true] {
+	background-color: var(--colour-blue);
+}
+[role=switch][aria-checked=true] > span {
+	margin-left: calc(1.5rem - 5%);
+}</pre>
+      <pre class="language-css" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 @use "sass:math";
@@ -59,13 +80,7 @@ $switch-height: 1.5rem !default;
 		}
 	}
 }</pre>
-      </div>
+      <pre class="language-js" data-tab="js">//-		DS2 core (c) 2024 Alexander McIlwraith 
-      <div tab="js">
-        <pre class="language-js">// Note that switch is a reserved word. 
-import * as swtch from "./js/core/switch/_switch.js";
-swtch.init();
-</pre>
-        <pre class="language-js">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 function flip(e) {
@@ -82,7 +97,6 @@ function flip(e) {
 
 module.exports = {
 	init: (p = document) => {
-		try {
 		p.querySelectorAll("[role='switch']").forEach((sw) => {
 			sw.innerHTML = "<span></span>";
 			sw.setAttribute("aria-checked", "false");
@@ -90,13 +104,9 @@ module.exports = {
 			sw.addEventListener("click", flip, false);
 			sw.addEventListener("keypress", flip, false);
 		})
-		} catch (e) {
-			console.warn("Cannot initialise switches.", e);
-		}
 	}
 }
 </pre>
     </div>
-    </div>
   </body>
 </html>

public/patterns/core/tabs/index.html

@@ -2,18 +2,11 @@
 <html> 
   <head>
     <title>Pattern</title>
-    <script>
-      let u = document.location.href.substring(0, document.location.href.search(/patterns/i));
-      let p = document.location.pathname.substring(document.location.pathname.search(/patterns/i));
-      p = p.replace(/\/$|\/index\.html/i, "").substring(9);
-      window.location = u + "?p=" + p;
-      
-    </script>
   </head>
   <body data-prismjs-copy-timeout="1500">
     <h2>What is it</h2>
     <p>A tabs component that provides different sections of content that are displayed one at a time when the user selects that information. </p>
-    <h2>When to use it</h2>
+    <h2>How to use it</h2>
     <p>The tabbed user interface enables users to jump to their target section quickly. Tabs present like logically group information on the same page. Information should  </p>
     <ul> 
       <li>be logically chunked and ordered</li>
@@ -22,16 +15,8 @@
       <li>obvious where they begin and end </li>
     </ul>
     <p>Users should not need to see content of multiple tabs simultaneously and the user should be able to easily recognise where they are within the content.  </p>
-    <h2>How to use it</h2>
+    <h2>When to use it</h2>
-    <p>The structure of the tab set is defined in html. There are two forms supported. Adding a class of <code class="inline">.tab-group</code> to the container element will work in place of the <code class="inline">tabset</code> tag, and the tab panels can be defined using either <code class="inline">tab=""</code> or <code class="inline">data-tab=""</code>. Passing an optional element to the init function will initialise tabs within that element. </p>
+    <p>The tab module can be initialised by importing a file with the javascript module using import * as tabs from "../pg/patterns/layouts/tabs/_tabs.js"; contains a modularized version of the jQuery code, so that it can be called on demand. It is what is used in the design system so that the JavaScript can be called at run time (after loading content).</p>
-    <p>The tab initalize function now takes a new function parameter in the form of an third argument is an object that can take the following callbacks: </p>
-    <ul>
-      <li>altModifer (When the altKey is used)</li>
-      <li>shiftModifier (When the shift key is used)</li>
-      <li>metaModifier (When the Windows key or Apple key is used)</li>
-    </ul>
-    <p>You can use these callbacks to create a custom event to get the tab information. </p>
-    <p>Note: There is a new core function (core.getTabPath) that will generate the query string and url hash for use in DS2 Core. You may wish to update your scaffolding.js file to make use of this functionality. </p>
     <tabset id="tabs">
       <pre class="language-html" tab="html">
         <tabset id="uniqueID">
@@ -53,8 +38,8 @@ tabset > ul, .tab-group > ul {
 	padding: 0;
 }
 tabset > ul li.separator, .tab-group > ul li.separator {
-	border-bottom: 1px solid #7f7f7f;
+	border-bottom: 1px solid var(--colour-grey);
-	border-left: 1px solid #7f7f7f;
+	border-left: 1px solid var(--colour-grey);
 	display: inline-block;
 	margin: 0.45rem 0 0 0;
 	width: 100%;
@@ -63,9 +48,9 @@ tabset .tab-hidden, .tab-group .tab-hidden {
 	display: none;
 }
 tabset [role=tab], .tab-group [role=tab] {
-	background-color: #FFF;
+	background-color: var(--colour-white);
-	border-left: 1px solid #7f7f7f;
+	border-left: 1px solid var(--colour-grey);
-	border-top: 1px solid #7f7f7f;
+	border-top: 1px solid var(--colour-grey);
 	border-radius: 0.5rem 0.5rem 0 0;
 	cursor: pointer;
 	margin: 0;
@@ -74,19 +59,19 @@ tabset [role=tab], .tab-group [role=tab] {
 	z-index: 2;
 }
 tabset [role=tab]:last-of-type, .tab-group [role=tab]:last-of-type {
-	border-right: 1px solid #7f7f7f;
+	border-right: 1px solid var(--colour-grey);
 }
 tabset [role=tab]:not(.selected), .tab-group [role=tab]:not(.selected) {
-	background-color: #f0f0f0;
+	background-color: var(--colour-grey-xxl);
-	border-bottom: 1px solid #7f7f7f;
+	border-bottom: 1px solid var(--colour-grey);
 }
 tabset [role=tab] span, .tab-group [role=tab] span {
 	display: block;
 	margin: 0 0 0.5rem 0;
 }
 tabset [role=tabpanel], .tab-group [role=tabpanel] {
-	background-color: #FFF;
+	background-color: var(--colour-white);
-	border: 1px solid #7f7f7f;
+	border: 1px solid var(--colour-grey);
 	border-top: none;
 	padding: 1rem;
 	z-index: 1;
@@ -94,13 +79,7 @@ tabset [role=tabpanel], .tab-group [role=tabpanel] {
 tabset [role=tabpanel]:not(.open), .tab-group [role=tabpanel]:not(.open) {
 	display: none;
 }</pre>
-      <div tab="scss">
+      <pre class="language-css" tab="scss">//		DS2 core (c) 2024 Alexander McIlwraith 
-        <pre class="language-sass">@import "scss/core/tabs/_tabs";
-@include tabs{ 
-	// optional content block
-};
-</pre>
-        <pre class="language-sass">//		DS2 core (c) 2024 Alexander McIlwraith 
 //		Licensed under CC BY-SA 4.0 
 
 $tab-border: #7f7f7f !default; 
@@ -169,46 +148,13 @@ $tab-notselected: #f0f0f0 !default;
 		}
 	}
 }</pre>
-      </div>
+      <pre class="language-css" tab="js">/*  DS2 core (c) 2024 Alexander McIlwraith 
-      <div tab="js">
+	import * as tabs from "../pg/patterns/layouts/tabs/_tabs.js";
-        <pre class="language-js">import * as tabs from "./js/core/tabs/_tabs.js";
+	tabs.init();
-tabs.init();</pre>
-        <pre class="language-js">/*  DS2 core (c) 2024 Alexander McIlwraith 
-	Released under Creative Commons Attribution-ShareAlike 4.0 International
  */
 
-// create a pure JS mouse click event
+export function init(p = document) { 
-const click = new MouseEvent('click', {
+	p.querySelectorAll(".tab-group, tabset").forEach(tabGroup => {
-	view: window,
-	bubbles: false,
-	cancelable: true
-});
-
-const waitForElement = (selector) => {
-    return new Promise(resolve => {
-        if (document.querySelector(selector)) {
-            return resolve(document.querySelector(selector));
-        }
-
-        const observer = new MutationObserver(mutations => {
-            if (document.querySelector(selector)) {
-                observer.disconnect();
-                resolve(document.querySelector(selector));
-            }
-        });
-
-        // If you get "parameter 1 is not of type 'Node'" error, see https://stackoverflow.com/a/77855838/492336
-        observer.observe(document.body, {
-            childList: true,
-            subtree: true
-        });
-    });
-}
-
-
-export function init(container = document, spacer = true, args = {}) { 
-
-	container.querySelectorAll(".tab-group, tabset").forEach(tabGroup => {
 
 		if (tabGroup.querySelector("[role=tablist]") === null) {
 			const tabgroup = tabGroup.getAttribute("id");
@@ -234,18 +180,11 @@ export function init(container = document, spacer = true, args = {}) {
 
 			const ul = document.createElement('ul');
 			ul.setAttribute("role", "tablist");
-			ul.innerHTML = spacer != true ? `${tablist}` : `${tablist}<li role="separator" class="separator"></li>`;
+			ul.innerHTML = `${tablist}<li role="separator" class="separator"></li>`;
 			tabGroup.insertBefore(ul, tabGroup.firstChild);
 
 			tabGroup.querySelectorAll('[role="tab"]').forEach(tab => {
-				tab.addEventListener("click", (e) => {
+				tab.addEventListener("click", () => {
-					if (e.altKey && typeof args.altModifier == "function") {
-						args.altModifier(tab);
-					} else if (e.shiftKey && typeof args.shiftModifier == "function") {
-						args.shiftModifier(tab);
-					} else if (e.metaKey && typeof args.metaModifier == "function") {
-						args.metaModifier(tab);
-					} else {
 					const siblings = Array.from(tab.parentNode.children);
 					siblings.forEach(sibling => sibling.classList.remove("selected"));
 					tab.classList.add("selected");
@@ -256,30 +195,13 @@ export function init(container = document, spacer = true, args = {}) {
 
 					const tabPanelId = tab.getAttribute("id").replace("tab", "tab-panel");
 					document.getElementById(tabPanelId).classList.add("open");
-					}
 				});
-
-
-				tab.addEventListener("keypress", (e) => {
-					e.preventDefault();
-					if( e.which == 32 || e.which == 13 ) {
-						e.currentTarget.dispatchEvent(click);
-					}
-				})
-			});
-		}
-
-		if (document.location.hash != "" && document.location.hash.substring(0,5) == "#tab-") {
-			waitForElement(document.location.hash).then((el) => {
-				el.scrollIntoView();
-				el.dispatchEvent(click);
 			});
 			
 		}
 	});
 }
 </pre>
-      </div>
     </tabset>
   </body>
 </html>

public/patterns/core/tooltip/index.html

@@ -11,9 +11,7 @@
     <p>Use tooltips to help differentiate between multiple, close, similar options. </p>
     <h2>How to use it</h2>
     <p class="notification-box info">Currently, there is no easy way to activate a hover without with pure CSS without using a keyboard or mouse. Level4 media queries aim to solve that.</p>
-    <p>Either form works. 
+    <p>Either form works. Place this inside another element for the tooltip to be 'linked to that element.' A container element may need to be added for a single tag element, such as a input field. </p>
-      <sticky-note class="blue">"Either form works": What are the two forms.</sticky-note>Place the <code class="language-html inline">tooltip</code> inside another element for the tooltip to be 'linked to that element.' A container element may need to be added for a single tag element, such as a input field. 
-    </p>
     <p>Tool tip positions are: </p>
     <ul> 
       <li>top / block-start</li>
@@ -22,11 +20,11 @@
       <li>left / inline-start</li>
     </ul>
     <p><a href="#">Link with a tool tip<span role="tooltip" inert="inert" tip-position="right">Tool tip content</span></a></p>
-    <tabset id="tooltip">
+    <div class="tab-group" id="tooltip">
-      <pre class="language-html" tab="html"><a href="#">Link with a tool tip<span role="tooltip" inert="inert" tip-position="right">Tool tip content</span></a></pre>
+      <pre class="language-html" data-tab="html"><a href="#">Link with a tool tip<span role="tooltip" inert="inert" tip-position="right">Tool tip content</span></a></pre>
-      <pre class="language-pug" tab="pug">a(href="#") Link with a tool tip
+      <pre class="language-pug" data-tab="pug">a(href="#") Link with a tool tip
 	span(role="tooltip" inert tip-position="right") Tool tip content</pre>
-      <pre class="language-css" tab="css">/* Position Options
+      <pre class="language-css" data-tab="css">/* Position Options
 	- top / block-start
 	- right / inline-end
 	- bottom / block-end
@@ -181,10 +179,7 @@
 		--tooltip-x: calc(-1 * 3px * -1);
 	}
 }</pre>
-      <div tab="scss">
+      <pre class="language-css" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
-        <pre class="language-sass">@import "scss/core/tooltip/_tooltip";
-@include tooltip;</pre>
-        <pre class="language-sass">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
 $tooltip-border-radius: .5rem !default;
@@ -362,6 +357,5 @@ $tooltip-pointer-top: conic-gradient(from 150deg at top, rgba(0, 0, 0, 0), #000
 	}
 }</pre>
     </div>
-    </tabset>
   </body>
 </html>

src/js/core/_core.js

@@ -21,7 +21,7 @@ const font = {
 	size: 0
 }
 
-const copyFallback = (copyInfo, attr) => {
+const copyColourFallback = (copyInfo, attr) => {
 	console.log("fallback")
 	var textArea = document.createElement('textarea');
 	textArea.value = copyInfo;
@@ -71,6 +71,22 @@ const showMessage = (m, s) => {
 	}, 1000); 
 }
 
+const oneClickSelect = (e, t = e.currentTarget) => {
+	// In here, "this" is the element
+	var range, selection;
+	if (window.getSelection) {
+		selection = window.getSelection();
+		range = document.createRange();
+		range.selectNodeContents(t);
+		selection.removeAllRanges();
+		selection.addRange(range);
+	} else if (document.body.createTextRange) {
+		range = document.body.createTextRange();
+		range.moveToElementText(t);
+		range.select();
+	}
+}
+
 const getURLVars = () => {
 	var oResult = {};
 	if (location.search.length > 0) {
@@ -86,19 +102,7 @@ const getURLVars = () => {
 }
 
 module.exports = {
-	url: (() => {
+	url: getURLVars(),
-		var v = {};
-		if (location.search.length > 0) {
-			var qs = (location.search.substr(1)).split("&");
-			for (var i = 0; i < qs.length; i++) {
-				var t = qs[i].split("=");
-				if (t[1].length > 0) {
-					v[t[0]] = decodeURIComponent(t[1].replace(/\+/g, '%20'));
-				}
-			}
-		}
-		return v;
-	})(),
 	cookie: {	
 		set: (name, value, expires, path, domain, secure) => {
 			switch(typeof expires) {
@@ -129,26 +133,12 @@ module.exports = {
 			}
 			return "";
 		},
-		remove: (cname) => {
+		remove: (cnane) => {
-			module.exports.cookie.set(cname, null, new Date(null));
+			setCookie(cname, "", -1);
 		},
 	},
-	oneClickSelect: (e, t = e.currentTarget) => {
-		// In here, "this" is the element
-		var range, selection;
-		if (window.getSelection) {
-			selection = window.getSelection();
-			range = document.createRange();
-			range.selectNodeContents(t);
-			selection.removeAllRanges();
-			selection.addRange(range);
-		} else if (document.body.createTextRange) {
-			range = document.body.createTextRange();
-			range.moveToElementText(t);
-			range.select();
-		}
-	},
 	colour: {
+
 		copy:  (w, t) => {
 			let c = t.parentNode.getAttribute("data-" + (w=="var" ? "token" : w));
 			c = w == "var" ? `var(${c})` : c;
@@ -157,10 +147,10 @@ module.exports = {
 				navigator.clipboard.writeText(c).then(function() {
 					showMessage(`Copied ${w}.`);
 				}, function(e) {
-					copyFallback(c,w);
+					copyColourFallback(c,w);
 				});
 			} else {
-				copyFallback(c, w);
+				copyColourFallback(c, w);
 			}
 		},
 
@@ -175,26 +165,6 @@ module.exports = {
 				});
 			})
 		}
-	},
-	getCSS: (el, prop, b = false) => {
-		return window.getComputedStyle(el, null).getPropertyValue(prop);
-	},
-	getTabPath: (t) => {
-		let url = window.location.toString();
-		url = url.indexOf("?") > 0 ? url.substring(0,url.indexOf("?")) : url;
-		url = `${url}?p=${t.closest("article").getAttribute("data-path")}#${t.getAttribute("id")}`
-		let type = "URL";
-		if (navigator.clipboard) {
-			navigator.clipboard.writeText(url).then(function() {
-				showMessage(`Copied ${type}.`);
-			}, function(e) {
-				copyFallback(url,type);
-			});
-		} else {
-			copyFallback(url, type);
-		}
-
-
 	},
 	init: (args = {}) => {
 		const url = getURLVars();
@@ -207,14 +177,7 @@ module.exports = {
 			if (url.p == -1) {
 				document.querySelector("title").innerHTML = `${url.p.toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`;
 			} else {
-				let theTitle = document.querySelectorAll("article");
+				document.querySelector("title").innerHTML = `${url.p.substring(url.p.lastIndexOf("/")+1).toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`
-				if (theTitle.length > 0) {					
-					theTitle = theTitle[0].getAttribute("data-name").toContent().toTitleCase();
-					if (document.querySelector("article").getAttribute("data-display") !== null) {
-						theTitle = document.querySelector("article").getAttribute("data-display")
-					}
-					document.querySelector("title").innerHTML = `${theTitle} | ${ document.querySelector("title").getAttribute("data-site") }`
-				}
 			}
 		}
 
@@ -226,6 +189,10 @@ module.exports = {
 					articles.forEach(article => {
 						let a = article.target;
 
+						// console.log("observing: ", { id: a.getAttribute("id"), intersecting: a.isIntersecting } )
+						// if (article.intersectionRatio > 0) {
+							// console.log("Is interesecting: ", { id: article.target.getAttribute("id"), intersecting: article.isIntersecting, ratio: article.intersectionRatio } )
+
 						if (article.isIntersecting == true) {
 							let path = a.getAttribute("data-path");
 							path = "patterns/" + 
@@ -266,7 +233,7 @@ module.exports = {
 
 											a.querySelectorAll("code").forEach((c)=> {
 												c.onclick = (e) => {
-													module.exports.oneClickSelect(e);
+													oneClickSelect(e);
 												}
 											})
 

src/js/scaffolding.js

@@ -12,12 +12,10 @@ import * as stickynote from "../pg/patterns/core/sticky-note/_sticky-note.js";
 import * as swtch      from "../pg/patterns/core/switch/_switch.js";
 import * as tabs       from "../pg/patterns/core/tabs/_tabs.js";
 
-// init c
+// init core
 core.init({
 	success: (a) => { 
-		tabs.init(a, true, {
+		tabs.init(a);
-			shiftModifier: core.getTabPath,
-		});
 		swtch.init(a);
 		stickynote.init(a);
 	},
@@ -27,6 +25,8 @@ core.init({
 });
 
 
+
+
 // deprecated switch handler
 const flipInfoSwitch = (e, s = e.currentTarget) => {
 	
@@ -40,10 +40,12 @@ const flipInfoSwitch = (e, s = e.currentTarget) => {
 		break; 
 
 		case "breakpoints" :
+			console.log("here")
 			core.cookie.set("show-breakpoints", s.getAttribute("aria-checked"), 30, "/");
 			document.querySelector("html").classList[( s.getAttribute("aria-checked") == "true" ? "add" : "remove" )]("show-breakpoints");
 		break; 
 	}
+
 }
 
 // create a pure JS mouse click event

src/pg/core/_colour-samples.pug

@@ -128,27 +128,24 @@
 -	function generateCSS(c, p) {
 - 		let o = "";	
 -		for (let i = 0; i < c.length; i++) {
--			o += `\n\t--${p}-${c[i].name.toLowerCase()}: ${ color(c[i].color, "hex").toLowerCase() };\n`;
+-			o += `\n\t--${p}-${c[i].name.toLowerCase()}: ${ color(c[i].color, "hex").toLowerCase() },\n`;
 -			for (let ii = 0; ii < c[i].grad.l.length; ii++) {
--				o += `\t--${p}-${c[i].grad.l[ii].n.toLowerCase()}: ${ color(c[i].grad.l[ii].c, "hex").toLowerCase() };\n`;
+-				o += `\t--${p}-${c[i].grad.l[ii].n.toLowerCase()}: ${ color(c[i].grad.l[ii].c, "hex").toLowerCase() },\n`;
 - 			}
 -			for (let ii = 0; ii < c[i].grad.d.length; ii++) {
--				o += `\t--${p}-${c[i].grad.d[ii].n.toLowerCase()}: ${ color(c[i].grad.d[ii].c, "hex").toLowerCase() };\n`;
+-				o += `\t--${p}-${c[i].grad.d[ii].n.toLowerCase()}: ${ color(c[i].grad.d[ii].c, "hex").toLowerCase() },\n`;
 - 			}
 -		}
 -		return o;
 -	}
 
-if !colortxt
-	- var colortxt = "color"
-
 
 mixin accessibility-info(c)
 		div.acchb 
-			span #{colortxt} & black 
+			span color & black 
 			small= getContrastRatio(color(c, "rgb"), "rgb(0,0,0)") + ":1"
 		div.acchw 
-			span #{colortxt} & white 
+			span color & white 
 			small= getContrastRatio(color(c, "rgb"), "rgb(255,255,255)") + ":1"
 		div.aa WCAG 2.0 AA 
 		div.accbaa.result

src/pg/core/_master-index.pug

@@ -29,9 +29,6 @@ mixin show-content(items, path)
 
 	- path = (path == "" ? "" : path +  "/") + items.name.toPath()
 
-	if items.core == true
-		- items.status = "complete"
-
 	article(id=path.replace(/\//g, "-").toPath()
 		data-name=items.name
 		data-status=items.status
@@ -41,11 +38,7 @@ mixin show-content(items, path)
 		data-path=path
 		style="height: 100vh"
 		)
-		if items.display
+
-			h1(class="status-" + items.status )
-				span= items.display
-					tool-tip(role="tooltip" inert tip-position="right")= items.status.toSentenceCase().toContent()
-		else 
 		h1(class="status-" + items.status )
 			span= items.name.toSentenceCase().toContent()
 				tool-tip(role="tooltip" inert tip-position="right")= items.status.toSentenceCase().toContent()
@@ -84,3 +77,18 @@ html(lang= lang )
 					+show-content(category, "")
 
 		script(src="assets/scaffolding-min.js")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/pg/core/_master-pattern.pug

@@ -7,11 +7,7 @@ block config
 
 mixin h(h) 
 	if headings[h]
-		if headings[h].indexOf("|") == -1
 		h2= headings[h]
-		else 
-			- var cntnt = headings[h].split("|")
-			| <#{cntnt[0]}>#{cntnt[1]}</#{cntnt[0]}> 
 
 - const getDate = function(){
 -	var d = new Date();
@@ -37,11 +33,6 @@ html
 	head
 		
 		title Pattern
-		script.
-			let u = document.location.href.substring(0, document.location.href.search(/patterns/i));
-			let p = document.location.pathname.substring(document.location.pathname.search(/patterns/i));
-			p = p.replace(/\/$|\/index\.html/i, "").substring(9);
-			window.location = u + "?p=" + p;
 
 	body(data-assetpath= assetpath data-prismjs-copy-timeout="1500")
 

src/pg/core/core.scss.pug

@@ -75,7 +75,7 @@ include _colour-samples
 									 "lighter   lighter   lighter  darker    darker    darker"
 									 "notes     notes     notes    notes     notes     notes";
 				grid-template-columns: repeat(6, 1fr);
-				grid-template-rows: repeat(2, 1.5rem) repeat(4, max-content); // 3rem repeat(2, 2rem) 1.5rem repeat(3, max-content); 
+				grid-template-rows: repeat(2, 1.5rem) 10rem repeat(3, max-content); // 3rem repeat(2, 2rem) 1.5rem repeat(3, max-content); 
 				padding: 1rem;
 				width: 20rem;
 				max-width: 318px;
@@ -115,7 +115,7 @@ include _colour-samples
 					display: grid; 
 					gap: .5rem;
 					grid-template-columns: repeat(3, 1fr);
-					grid-template-rows: repeat(3, max-content);
+					grid-template-rows: 2.5rem repeat(2, max-content);
 					.result {
 						align-items: center;
 						border-radius: .5rem;
@@ -188,7 +188,7 @@ include _colour-samples
 								padding: .5rem;
 								width: 20rem;
 								max-width: 318px;
-								height: max-contents;
+								height: 10.5rem;
 
 								display: grid; 
 								gap: .5rem;
@@ -231,7 +231,6 @@ include _colour-samples
 									display: block;
 									width: 100%;
 									place-self: stretch;
-									text-align: center;
 									span {
 										border: none;
 										font-size: .9rem;

src/pg/patterns/core/breakpoints/_breakpoints.scss

@@ -10,7 +10,6 @@ $grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 14
 		color: white;	
 		content: "bigger than extra large";
 		display: grid;
-		font-family: sans-serif;
 		font-size: 25px;
 		grid-template-columns: auto;
 		padding: 25px;

src/pg/patterns/core/breakpoints/index.pug

@@ -17,14 +17,6 @@ block content
 
 	p When using this, use the default break points as they are set to the same as the Bootstrap framework. The grid for the design system at large break point has been widened to accompdate 3 colour cards across. 
 
-	tabset#breakpoints
+	div.tab-group#breakpoints
-		div(tab="scss")
+		pre.language-css(data-tab="scss")
-			+h(3)
-			pre.language-sass.
-				@import "scss/core/breakpoints/breakpoints";
-				@include break([breakpoint]) {
-					// css here
-				}
-			+h(4)
-			pre.language-sass
 			include _breakpoints.scss

src/pg/patterns/core/header/header.css

@@ -1 +1,53 @@
-header{display:-ms-grid;display:grid;-ms-grid-rows:1.75rem 3.5rem;grid-template-rows:1.75rem 3.5rem;-ms-grid-column:2;-ms-grid-column-span:2;grid-column:2/4;overflow:hidden}header svg{grid-column:1/-1;grid-row:1/-1;-ms-grid-row-align:stretch;-ms-grid-column-align:stretch;place-self:stretch}header svg text{-webkit-transform:translate(-1rem,7.25rem);-ms-transform:translate(-1rem,7.25rem);transform:translate(-1rem,7.25rem);font-size:10rem;font-weight:1000;font-family:sans-serif;fill:var(--colour-grey-xxl)}header>div{-ms-grid-row:2;grid-row:2;grid-column:1/-1;display:-ms-grid;display:grid;grid-column-gap:1rem;-ms-grid-columns:auto -webkit-max-content -webkit-max-content;-ms-grid-columns:auto max-content max-content;grid-template-columns:auto -webkit-max-content -webkit-max-content;grid-template-columns:auto max-content max-content}header>div .header-title h1{margin:0;padding:0 1rem}header>div .header-title h1 a,header>div .header-title h1 a:visited{border-bottom:none;color:var(--colour-black);font-family:sans-serif;font-size:2.5rem;font-size:32px;font-weight:700;margin:0;padding:0;text-decoration:none}
+header {
+	display: -ms-grid;
+	display: grid;
+	-ms-grid-rows: 1.75rem 3.5rem;
+	grid-template-rows: 1.75rem 3.5rem;
+	-ms-grid-column: 2;
+	-ms-grid-column-span: 2;
+	grid-column: 2/4;
+	overflow: hidden;
+}
+header svg {
+	grid-column: 1/-1;
+	grid-row: 1/-1;
+	-ms-grid-row-align: stretch;
+	-ms-grid-column-align: stretch;
+	place-self: stretch;
+}
+header svg text {
+	-webkit-transform: translate(-1rem, 7.25rem);
+	    -ms-transform: translate(-1rem, 7.25rem);
+	        transform: translate(-1rem, 7.25rem);
+	font-size: 10rem;
+	font-weight: 1000;
+	font-family: sans-serif;
+	fill: var(--colour-grey-xxl);
+}
+header > div {
+	-ms-grid-row: 2;
+	grid-row: 2;
+	grid-column: 1/-1;
+	display: -ms-grid;
+	display: grid;
+	grid-column-gap: 1rem;
+	-ms-grid-columns: auto -webkit-max-content -webkit-max-content;
+	-ms-grid-columns: auto max-content max-content;
+	grid-template-columns: auto -webkit-max-content -webkit-max-content;
+	grid-template-columns: auto max-content max-content;
+}
+header > div .header-title h1 {
+	margin: 0;
+	padding: 0 1rem;
+}
+header > div .header-title h1 a, header > div .header-title h1 a:visited {
+	border-bottom: none;
+	color: var(--colour-black);
+	font-family: sans-serif;
+	font-size: 2.5rem;
+	font-size: 32px;
+	font-weight: 700;
+	margin: 0;
+	padding: 0;
+	text-decoration: none;
+}

src/pg/patterns/core/header/index.pug

@@ -10,10 +10,11 @@ block content
 	p Use a header at the top of every page. The 'front page' of a site may have a different header than the rest of the pages. 
 
 	+h(2)
-	p Place the header at the top of the page after the skip to main content link. You will likely want to replace core header should be replaced with your own site's header. To do this, remove the #[code.inline.language-js core: true ] and create your own pattern in the location you wish it in your design system. 
+	p Place the header at the top of the page after the skip to main content link. This basic header should be replaced with your own site's header. 
 
-	tabset#header
+
-		pre.language-html(tab="html")
+	div.tab-group#header
+		pre.language-html(data-tab="html")
 			// create temp variables and store the design system values
 			- var tmpsite= site
 			- var tmproot= root
@@ -25,14 +26,12 @@ block content
 			//- reset variables to original values
 			- site= tmpsite 
 			- root= tmproot 
-		pre.language-pug(tab="pug")
+
+		pre.language-html(data-tab="html")
+			include _header.pug
+		pre.language-pug(data-tab="pug")
 			include _header.pp
-		pre.language-css(tab="css")
+		pre.language-css(data-tab="css")
 			include header.css
-		div.language-sass(tab="scss")
+		pre.language-sass(data-tab="scss")
-			
-			pre.language-sass.
-				@import "scss/core/header/header;
-
-			pre.language-sass
 			include _header.scss

src/pg/patterns/core/sticky-note/index.pug

@@ -8,12 +8,13 @@ block content
 	+h(1)
 	p Use a sticky when you want to make a note without adding it to the content. 
 	+h(2)
-	p Uses absolute positioning. Passing an optional element to the init function will initialise tabs within that element. You can move the position using either #[code.language-html.inline float="[ right | left ]"] or #[code.language-html.inline offset="[ top | left ]"]. Offset will take negative values in any web measurement unit.
+	p Uses absolute positioning. 
-		sticky-note.blue(offset="-10rem 1rem") This #[strong is] a sample sticky. You can drag it out of the way if you need to see the content under it.
+		sticky-note(float="right").blue This #[strong is] a sample sticky. 
-		sticky-note(float="right") You will notice when you hover over the sticky, it shows a dot in the colour of the sticky in the position where the sticky note refers to (assuming you haven't dragged it and scrolled that location off the screen).
+			| You can drag it out of the way if you need to see the content under it.
 
 	p If you wish to create a custom element, that extends another HTML element, the native element has to be extended in customElements.define(). Custom elements that inherit native elements are also known as "type extension custom elements". 	
 
+	sticky-note You will notice when you hover over the sticky, it shows a dot in the colour of the sticky in the position where the sticky note refers to (assuming you haven't dragged it and scrolled that location off the screen).
 
 	tabset#sticky-note
 		pre.language-html(tab="html")
@@ -22,22 +23,7 @@ block content
 			include _sticky-note.pp
 		pre.language-css(data-tab="css") 
 			include sticky-note.css
-		div(tab="scss") 
+		pre.language-css(data-tab="scss") 
-			+h(3)
-			pre.language-sass.
-				$sticky-colors: ( [sass map with your own defined colours] );
-				@import "scss/core/switch/_sticky-note";
-				@include sticky-note;
-
-			+h(4)
-			pre.language-sass
 			include _sticky-note.scss
-		div(tab="js") 
+		pre.language-js(data-tab="js") 
-			+h(3)
-			pre.language-js.
-				import * as stickynote from ""./js/core/sticky-note/_sticky-note.js";
-				stickynote.init()
-
-			+h(4)
-			pre.language-js
 			include _sticky-note.js

src/pg/patterns/core/sticky-note/sticky-note.css

@@ -1 +1,126 @@
-@import url("https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap");sticky-note-wrapper{-webkit-box-sizing:border-box;box-sizing:border-box;border:1px solid transparent;border-radius:50%;display:inline-block;height:0.5rem;position:relative;width:0.5rem}sticky-note-wrapper *{-webkit-box-sizing:border-box;box-sizing:border-box}sticky-note-wrapper sticky-note{cursor:-webkit-grab;cursor:grab;display:-ms-grid;display:grid;float:left;font-size:1rem;height:13rem;left:0;place-items:stretch;position:absolute;top:0;width:13rem;z-index:100}sticky-note-wrapper sticky-note:active{cursor:-webkit-grabbing;cursor:grabbing;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}sticky-note-wrapper sticky-note.right{float:right}sticky-note-wrapper sticky-note>div{-ms-grid-row:1;grid-row:1;-ms-grid-column:1;grid-column:1}sticky-note-wrapper sticky-note>div:first-child{background-color:rgba(0,0,0,0.25);-webkit-box-shadow:-2px 2px 15px 0 rgba(0,0,0,0.5);box-shadow:-2px 2px 15px 0 rgba(0,0,0,0.5);display:-ms-grid;display:grid;margin:2rem 1rem 0.25rem 0.36rem;width:calc(100% - 1rem)}sticky-note-wrapper sticky-note>div:nth-child(2){clip-path:url(#stickyClip);display:-ms-grid;display:grid;font-family:"Kalam",cursive;font-style:1rem;font-weight:300;line-height:1.25rem;padding:1rem;place-items:center;text-align:center}sticky-note-wrapper sticky-note>div:nth-child(2)>*{font-family:"Kalam",cursive!important;font-style:normal!important;font-weight:300!important}@media screen and (max-width:1024px){sticky-note-wrapper sticky-note>div:nth-child(2){max-width:13rem;min-width:13rem;width:1rem}}@media screen and (max-width:768px){sticky-note-wrapper sticky-note>div:nth-child(2){font-size:1.75rem;max-width:21rem;min-height:21rem}}@media screen and (max-width:640px){sticky-note-wrapper sticky-note>div:nth-child(2){font-size:2.5rem;max-width:26rem;min-height:26rem}}sticky-note-wrapper sticky-note>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#ffffdd),color-stop(2%,#ffffd3),color-stop(12%,#ffffd3),color-stop(75%,#ffffc9),to(#ffffba));background:linear-gradient(180deg,#ffffdd 0%,#ffffd3 2%,#ffffd3 12%,#ffffc9 75%,#ffffba 100%)}sticky-note-wrapper sticky-note.blue>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#9dddec),color-stop(2%,#94daea),color-stop(12%,#94daea),color-stop(75%,#8bd7e8),to(#7fd3e6));background:linear-gradient(180deg,#9dddec 0%,#94daea 2%,#94daea 12%,#8bd7e8 75%,#7fd3e6 100%)}sticky-note-wrapper sticky-note.pink>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#fa7c93),color-stop(2%,#fa728b),color-stop(12%,#fa728b),color-stop(75%,#fa6883),to(#f95977));background:linear-gradient(180deg,#fa7c93 0%,#fa728b 2%,#fa728b 12%,#fa6883 75%,#f95977 100%)}sticky-note-wrapper sticky-note.green>div:nth-child(2){background:-webkit-gradient(linear,left top,left bottom,from(#c5fcc9),color-stop(2%,#bbfbc0),color-stop(12%,#bbfbc0),color-stop(75%,#b1fab7),to(#a3faaa));background:linear-gradient(180deg,#c5fcc9 0%,#bbfbc0 2%,#bbfbc0 12%,#b1fab7 75%,#a3faaa 100%)}sticky-note-wrapper:has(sticky-note:hover){background-color:#ffffd3;border:1px solid black}sticky-note-wrapper:has(sticky-note.yellow:hover){background-color:#ffffd3}sticky-note-wrapper:has(sticky-note.blue:hover){background-color:#94daea}sticky-note-wrapper:has(sticky-note.pink:hover){background-color:#fa728b}sticky-note-wrapper:has(sticky-note.green:hover){background-color:#bbfbc0}
+@import url("https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap");
+sticky-note-wrapper {
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
+	border: 1px solid transparent;
+	border-radius: 50%;
+	display: inline-block;
+	height: 0.5rem;
+	position: relative;
+	width: 0.5rem;
+}
+sticky-note-wrapper * {
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+sticky-note-wrapper sticky-note {
+	cursor: -webkit-grab;
+	cursor: grab;
+	display: -ms-grid;
+	display: grid;
+	float: left;
+	font-size: 1rem;
+	height: 13rem;
+	left: 0;
+	place-items: stretch;
+	position: absolute;
+	top: 0;
+	width: 13rem;
+	z-index: 100;
+}
+sticky-note-wrapper sticky-note:active {
+	cursor: -webkit-grabbing;
+	cursor: grabbing;
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	    -ms-user-select: none;
+	        user-select: none;
+}
+sticky-note-wrapper sticky-note.right {
+	float: right;
+}
+sticky-note-wrapper sticky-note > div {
+	-ms-grid-row: 1;
+	grid-row: 1;
+	-ms-grid-column: 1;
+	grid-column: 1;
+}
+sticky-note-wrapper sticky-note > div:nth-child(1) {
+	background-color: rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: -2px 2px 15px 0 rgba(0, 0, 0, 0.5);
+	        box-shadow: -2px 2px 15px 0 rgba(0, 0, 0, 0.5);
+	display: -ms-grid;
+	display: grid;
+	margin: 2rem 1rem 0.25rem 0.36rem;
+	width: calc(100% - 1rem);
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) {
+	clip-path: url(#stickyClip);
+	display: -ms-grid;
+	display: grid;
+	font-family: "Kalam", cursive;
+	font-style: 1rem;
+	font-weight: 300;
+	line-height: 1.25rem;
+	padding: 1rem;
+	place-items: center;
+	text-align: center;
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) > * {
+	font-family: "Kalam", cursive !important;
+	font-style: normal !important;
+	font-weight: 300 !important;
+}
+@media screen and (max-width: 1024px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		max-width: 13rem;
+		min-width: 13rem;
+		width: 1rem;
+	}
+}
+@media screen and (max-width: 768px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		font-size: 1.75rem;
+		max-width: 21rem;
+		min-height: 21rem;
+	}
+}
+@media screen and (max-width: 640px) {
+	sticky-note-wrapper sticky-note > div:nth-child(2) {
+		font-size: 2.5rem;
+		max-width: 26rem;
+		min-height: 26rem;
+	}
+}
+sticky-note-wrapper sticky-note > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#ffffdd), color-stop(2%, #ffffd3), color-stop(12%, #ffffd3), color-stop(75%, #ffffc9), to(#ffffba));
+	background: linear-gradient(180deg, #ffffdd 0%, #ffffd3 2%, #ffffd3 12%, #ffffc9 75%, #ffffba 100%);
+}
+sticky-note-wrapper sticky-note.blue > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#9dddec), color-stop(2%, #94daea), color-stop(12%, #94daea), color-stop(75%, #8bd7e8), to(#7fd3e6));
+	background: linear-gradient(180deg, #9dddec 0%, #94daea 2%, #94daea 12%, #8bd7e8 75%, #7fd3e6 100%);
+}
+sticky-note-wrapper sticky-note.pink > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#fa7c93), color-stop(2%, #fa728b), color-stop(12%, #fa728b), color-stop(75%, #fa6883), to(#f95977));
+	background: linear-gradient(180deg, #fa7c93 0%, #fa728b 2%, #fa728b 12%, #fa6883 75%, #f95977 100%);
+}
+sticky-note-wrapper sticky-note.green > div:nth-child(2) {
+	background: -webkit-gradient(linear, left top, left bottom, from(#c5fcc9), color-stop(2%, #bbfbc0), color-stop(12%, #bbfbc0), color-stop(75%, #b1fab7), to(#a3faaa));
+	background: linear-gradient(180deg, #c5fcc9 0%, #bbfbc0 2%, #bbfbc0 12%, #b1fab7 75%, #a3faaa 100%);
+}
+sticky-note-wrapper:has(sticky-note:hover) {
+	background-color: #ffffd3;
+	border: 1px solid black;
+}
+sticky-note-wrapper:has(sticky-note.yellow:hover) {
+	background-color: #ffffd3;
+}
+sticky-note-wrapper:has(sticky-note.blue:hover) {
+	background-color: #94daea;
+}
+sticky-note-wrapper:has(sticky-note.pink:hover) {
+	background-color: #fa728b;
+}
+sticky-note-wrapper:has(sticky-note.green:hover) {
+	background-color: #bbfbc0;
+}

src/pg/patterns/core/switch/_switch.js

@@ -15,7 +15,6 @@ function flip(e) {
 
 module.exports = {
 	init: (p = document) => {
-		try {
 		p.querySelectorAll("[role='switch']").forEach((sw) => {
 			sw.innerHTML = "<span></span>";
 			sw.setAttribute("aria-checked", "false");
@@ -23,8 +22,5 @@ module.exports = {
 			sw.addEventListener("click", flip, false);
 			sw.addEventListener("keypress", flip, false);
 		})
-		} catch (e) {
-			console.warn("Cannot initialise switches.", e);
-		}
 	}
 }

src/pg/patterns/core/switch/index.pug

@@ -21,28 +21,13 @@ block content
 		span#example-switch(role="switch")
 
 	div#switches.tab-group
-		pre.language-html(tab="html")
+		pre.language-html(data-tab="html")
 			include _switch.pug
-		pre.language-pug(tab="pug")
+		pre.language-pug(data-tab="pug")
 			include _switch.pp
-		pre.language-css(tab="css")
+		pre.language-css(data-tab="css")
 			include switch.css
-		div(tab="scss")
+		pre.language-css(data-tab="scss")
-			+h(3)
-			pre.language-sass.
-				@import "scss/core/switch/_switch"; 
-				@include switch;
-				
-			+h(4)
-			pre.language-sass
 			include _switch.scss
-		div(tab="js")
+		pre.language-js(data-tab="js")
-			+h(3)
-			pre.language-js.
-				// Note that switch is a reserved word. 
-				import * as swtch from "./js/core/switch/_switch.js";
-				swtch.init();
-
-			+h(4)
-			pre.language-js
 			include _switch.js

src/pg/patterns/core/switch/switch.css

@@ -1 +1,26 @@
-[role=switch]{display:-ms-inline-grid;display:inline-grid;border:1px solid #2e51a1;background-color:#d8d8d8;border-radius:0.75rem;height:1.5rem;width:3rem;-webkit-transition:all 500ms;transition:all 500ms}[role=switch]>span{display:inline-block;background-color:white;border-radius:50%;margin:2%;width:calc(1.5rem - 2%);-webkit-transition:all 500ms;transition:all 500ms}[role=switch][aria-checked=true]{background-color:#2e51a1}[role=switch][aria-checked=true]>span{margin-left:calc(1.5rem - 5%)}
+[role=switch] {
+	display: -ms-inline-grid;
+	display: inline-grid;
+	border: 1px solid var(--colour-blue);
+	background-color: var(--colour-grey-xl);
+	border-radius: 0.75rem;
+	height: 1.5rem;
+	width: 3rem;
+	-webkit-transition: all 500ms;
+	transition: all 500ms;
+}
+[role=switch] > span {
+	display: inline-block;
+	background-color: white;
+	border-radius: 50%;
+	margin: 2%;
+	width: calc(1.5rem - 2%);
+	-webkit-transition: all 500ms;
+	transition: all 500ms;
+}
+[role=switch][aria-checked=true] {
+	background-color: var(--colour-blue);
+}
+[role=switch][aria-checked=true] > span {
+	margin-left: calc(1.5rem - 5%);
+}

src/pg/patterns/core/tabs/_tabs.js

@@ -1,39 +1,10 @@
 /*  DS2 core (c) 2024 Alexander McIlwraith 
-	Released under Creative Commons Attribution-ShareAlike 4.0 International
+	import * as tabs from "../pg/patterns/layouts/tabs/_tabs.js";
+	tabs.init();
  */
 
-// create a pure JS mouse click event
+export function init(p = document) { 
-const click = new MouseEvent('click', {
+	p.querySelectorAll(".tab-group, tabset").forEach(tabGroup => {
-	view: window,
-	bubbles: false,
-	cancelable: true
-});
-
-const waitForElement = (selector) => {
-    return new Promise(resolve => {
-        if (document.querySelector(selector)) {
-            return resolve(document.querySelector(selector));
-        }
-
-        const observer = new MutationObserver(mutations => {
-            if (document.querySelector(selector)) {
-                observer.disconnect();
-                resolve(document.querySelector(selector));
-            }
-        });
-
-        // If you get "parameter 1 is not of type 'Node'" error, see https://stackoverflow.com/a/77855838/492336
-        observer.observe(document.body, {
-            childList: true,
-            subtree: true
-        });
-    });
-}
-
-
-export function init(container = document, spacer = true, args = {}) { 
-
-	container.querySelectorAll(".tab-group, tabset").forEach(tabGroup => {
 
 		if (tabGroup.querySelector("[role=tablist]") === null) {
 			const tabgroup = tabGroup.getAttribute("id");
@@ -59,18 +30,11 @@ export function init(container = document, spacer = true, args = {}) {
 
 			const ul = document.createElement('ul');
 			ul.setAttribute("role", "tablist");
-			ul.innerHTML = spacer != true ? `${tablist}` : `${tablist}<li role="separator" class="separator"></li>`;
+			ul.innerHTML = `${tablist}<li role="separator" class="separator"></li>`;
 			tabGroup.insertBefore(ul, tabGroup.firstChild);
 
 			tabGroup.querySelectorAll('[role="tab"]').forEach(tab => {
-				tab.addEventListener("click", (e) => {
+				tab.addEventListener("click", () => {
-					if (e.altKey && typeof args.altModifier == "function") {
-						args.altModifier(tab);
-					} else if (e.shiftKey && typeof args.shiftModifier == "function") {
-						args.shiftModifier(tab);
-					} else if (e.metaKey && typeof args.metaModifier == "function") {
-						args.metaModifier(tab);
-					} else {
 					const siblings = Array.from(tab.parentNode.children);
 					siblings.forEach(sibling => sibling.classList.remove("selected"));
 					tab.classList.add("selected");
@@ -81,23 +45,7 @@ export function init(container = document, spacer = true, args = {}) {
 
 					const tabPanelId = tab.getAttribute("id").replace("tab", "tab-panel");
 					document.getElementById(tabPanelId).classList.add("open");
-					}
 				});
-
-
-				tab.addEventListener("keypress", (e) => {
-					e.preventDefault();
-					if( e.which == 32 || e.which == 13 ) {
-						e.currentTarget.dispatchEvent(click);
-					}
-				})
-			});
-		}
-
-		if (document.location.hash != "" && document.location.hash.substring(0,5) == "#tab-") {
-			waitForElement(document.location.hash).then((el) => {
-				el.scrollIntoView();
-				el.dispatchEvent(click);
 			});
 			
 		}

src/pg/patterns/core/tabs/index.pug

@@ -7,7 +7,7 @@ block content
 	+h(0)
 	p A tabs component that provides different sections of content that are displayed one at a time when the user selects that information. 
 
-	+h(1)
+	+h(2)
 	p The tabbed user interface enables users to jump to their target section quickly. Tabs present like logically group information on the same page. Information should  
 
 	ul 
@@ -19,18 +19,8 @@ block content
 	p Users should not need to see content of multiple tabs simultaneously and the user should be able to easily recognise where they are within the content.  
 
 
-	+h(2)
+	+h(1)
-	p The structure of the tab set is defined in html. There are two forms supported. Adding a class of #[code.inline .tab-group] to the container element will work in place of the #[code.inline tabset] tag, and the tab panels can be defined using either #[code.inline tab=""] or #[code.inline data-tab=""]. Passing an optional element to the init function will initialise tabs within that element. 
+	p The tab module can be initialised by importing a file with the javascript module using import * as tabs from "../pg/patterns/layouts/tabs/_tabs.js"; contains a modularized version of the jQuery code, so that it can be called on demand. It is what is used in the design system so that the JavaScript can be called at run time (after loading content).
-
-	p The tab initalize function now takes a new function parameter in the form of an third argument is an object that can take the following callbacks: 
-	ul
-		li altModifer (When the altKey is used)
-		li shiftModifier (When the shift key is used)
-		li metaModifier (When the Windows key or Apple key is used)
-	p You can use these callbacks to create a custom event to get the tab information. 
-
-	p Note: There is a new core function (core.getTabPath) that will generate the query string and url hash for use in DS2 Core. You may wish to update your scaffolding.js file to make use of this functionality. 
-
 
 	tabset#tabs
 		pre.language-html(tab="html")
@@ -39,23 +29,8 @@ block content
 			include _tabs.pp
 		pre.language-css(tab="css")
 			include tabs.css
-		div(tab="scss")
+		pre.language-css(tab="scss")
-			+h(3)
-			pre.language-sass.
-				@import "scss/core/tabs/_tabs";
-				@include tabs{ 
-					// optional content block
-				};
-
-			+h(4)
-			pre.language-sass
 			include _tabs.scss
-		div(tab="js")
+		pre.language-css(tab="js")
-			+h(3)
-			pre.language-js.
-				import * as tabs from "./js/core/tabs/_tabs.js";
-				tabs.init();
-			+h(4)
-			pre.language-js
 			include _tabs.js
 

src/pg/patterns/core/tabs/tabs.css

@@ -9,8 +9,8 @@ tabset > ul, .tab-group > ul {
 	padding: 0;
 }
 tabset > ul li.separator, .tab-group > ul li.separator {
-	border-bottom: 1px solid #7f7f7f;
+	border-bottom: 1px solid var(--colour-grey);
-	border-left: 1px solid #7f7f7f;
+	border-left: 1px solid var(--colour-grey);
 	display: inline-block;
 	margin: 0.45rem 0 0 0;
 	width: 100%;
@@ -19,9 +19,9 @@ tabset .tab-hidden, .tab-group .tab-hidden {
 	display: none;
 }
 tabset [role=tab], .tab-group [role=tab] {
-	background-color: #FFF;
+	background-color: var(--colour-white);
-	border-left: 1px solid #7f7f7f;
+	border-left: 1px solid var(--colour-grey);
-	border-top: 1px solid #7f7f7f;
+	border-top: 1px solid var(--colour-grey);
 	border-radius: 0.5rem 0.5rem 0 0;
 	cursor: pointer;
 	margin: 0;
@@ -30,19 +30,19 @@ tabset [role=tab], .tab-group [role=tab] {
 	z-index: 2;
 }
 tabset [role=tab]:last-of-type, .tab-group [role=tab]:last-of-type {
-	border-right: 1px solid #7f7f7f;
+	border-right: 1px solid var(--colour-grey);
 }
 tabset [role=tab]:not(.selected), .tab-group [role=tab]:not(.selected) {
-	background-color: #f0f0f0;
+	background-color: var(--colour-grey-xxl);
-	border-bottom: 1px solid #7f7f7f;
+	border-bottom: 1px solid var(--colour-grey);
 }
 tabset [role=tab] span, .tab-group [role=tab] span {
 	display: block;
 	margin: 0 0 0.5rem 0;
 }
 tabset [role=tabpanel], .tab-group [role=tabpanel] {
-	background-color: #FFF;
+	background-color: var(--colour-white);
-	border: 1px solid #7f7f7f;
+	border: 1px solid var(--colour-grey);
 	border-top: none;
 	padding: 1rem;
 	z-index: 1;

src/pg/patterns/core/tooltip/_tooltip.scss

@@ -1,7 +1,6 @@
 //-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
-$font-body: sans-serif !default;
 $tooltip-border-radius: .5rem !default;
 $tooltip-dark-allow: true !default;
 $tooltip-dark-background: #1f2127 !default;
@@ -30,7 +29,6 @@ $tooltip-pointer-top: conic-gradient(from 150deg at top, rgba(0, 0, 0, 0), #000
 		border-radius: $tooltip-border-radius;
 		color: $tooltip-light-foreground;
 		filter: $tooltip-light-drop-shadow;
-		$font-family: $font-body;
 		font-size: 1rem;
 		font-weight: 400;
 		inline-size: max-content;

src/pg/patterns/core/tooltip/index.pug

@@ -6,7 +6,6 @@ block content
 
 	+h(0)
 	p Tooltips provide brief information messaging through a mouse or keyboard hover. 
-
 	+h(1)
 	p Use tool tips to provide additional information. Don't use tooltips for that is required to complete an interaction as the information disappears when it loses the hover state. 
 	
@@ -16,11 +15,7 @@ block content
 
 	p.notification-box.info Currently, there is no easy way to activate a hover without with pure CSS without using a keyboard or mouse. Level4 media queries aim to solve that.
 
-	
+	p Either form works. Place this inside another element for the tooltip to be 'linked to that element.' A container element may need to be added for a single tag element, such as a input field. 
-
-	p Either form works. 
-		sticky-note.blue "Either form works": What are the two forms.
-		| Place the #[code.language-html.inline tooltip] inside another element for the tooltip to be 'linked to that element.' A container element may need to be added for a single tag element, such as a input field. 
 
 	p Tool tip positions are: 
 	ul 
@@ -33,19 +28,13 @@ block content
 		include _tooltip.pug
 
 
-	tabset#tooltip
+	div#tooltip.tab-group
-		pre.language-html(tab="html")
+		pre.language-html(data-tab="html")
 			include _tooltip.pug
-		pre.language-pug(tab="pug")
+		pre.language-pug(data-tab="pug")
 			include _tooltip.pp
-		pre.language-css(tab="css")
+		pre.language-css(data-tab="css")
 			include tooltip.css
-		div(tab="scss")
+		pre.language-css(data-tab="scss")
-			+h(3)
-			pre.language-sass.
-				@import "scss/core/tooltip/_tooltip";
-				@include tooltip;
-			+h(4)
-			pre.language-sass
 			include _tooltip.scss
 

src/scss/_core.scss

@@ -74,7 +74,7 @@
 								 "lighter   lighter   lighter  darker    darker    darker"
 								 "notes     notes     notes    notes     notes     notes";
 			grid-template-columns: repeat(6, 1fr);
-			grid-template-rows: repeat(2, 1.5rem) repeat(4, max-content); // 3rem repeat(2, 2rem) 1.5rem repeat(3, max-content); 
+			grid-template-rows: repeat(2, 1.5rem) 10rem repeat(3, max-content); // 3rem repeat(2, 2rem) 1.5rem repeat(3, max-content); 
 			padding: 1rem;
 			width: 20rem;
 			max-width: 318px;
@@ -114,7 +114,7 @@
 				display: grid; 
 				gap: .5rem;
 				grid-template-columns: repeat(3, 1fr);
-				grid-template-rows: repeat(3, max-content);
+				grid-template-rows: 2.5rem repeat(2, max-content);
 				.result {
 					align-items: center;
 					border-radius: .5rem;
@@ -187,7 +187,7 @@
 							padding: .5rem;
 							width: 20rem;
 							max-width: 318px;
-							height: max-contents;
+							height: 10.5rem;
 
 							display: grid; 
 							gap: .5rem;
@@ -230,7 +230,6 @@
 								display: block;
 								width: 100%;
 								place-self: stretch;
-								text-align: center;
 								span {
 									border: none;
 									font-size: .9rem;