Update div.tab-group to use tabset

Safe to assume that unless you're still copying the design system to some place that the result won't be any different. Since that is such an edge case a page reload should suffice.

Readme.md

@@ -1,6 +1,25 @@
 # DS2 Core
 
+## "Installation"
 
+File                          | Processes to 
+------------------------------|------------------------------
+src/js/scaffolding.js         | public/assets/
+src/scss/scaffolding.scss     | public/assets/
+src/pg/core/core.scss.pug     | src/scss/
+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
+
+functions
+
+beforeArticleLoad - called before any patterns are started to load 
+success - called when loading a pattern is successful if the result is an HTTP 200
+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. 
 
 
 ## About the content variable
@@ -10,7 +29,26 @@ The content variable in \_config.pug defines your array of patterns. It is made
 - 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
 - template - (optional) [ pug (default) | md ] the file type of a pattern's index file
+- core - (optional ) [ true | false ] if true, it will pull from the core folder
 - files - (optional) an array of patterns under the parent. 
 
 By changing and resaving the \_config.pug file, (our change is often adding or removing a random space) all of the pug patterns will recompile. Note that md templates will not recompile automatically when config is saved and updated as markdown files don't have an include. 
 
+## Including PugJS in Pug files without compiling
+If you wish to include Pug output as code in your instance, you can do this without manually creating a second 'dot container' version of the file. Including files with 'unrecognised' extensions does not compile them. 
+
+1. In your project config, create a Custom Tool called Pug pattern to pug file 
+1. Check Process automatically and set the command to 'cp {{input}} {{output}}' on Mac/Linux and 'copy {{input}} {{output}}' on Windows. (This is just your operating system's command line file copy executable.)
+1. Set the Output to Relative to input
+1. Set the Output Extension to .pug
+
+In your design system implementation, 
+1. Create the files that you edit as _[pattern].pp files, and set them to auto compile. (You may wish to let your text editor know what they are, so the syntax highlighting works.
+1. Save the file, ensure that it is set to in prepros it is set to process automatically. 
+1. Include the .pp file as your pug pattern with .language-pug and include the .pug file as your html output. 
+
+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. 
+
+
+## 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-project

@@ -2,7 +2,11 @@
 	"folders":
 	[
 		{
-			"path": "."
+			"path": ".",
+			"folder_exclude_patterns": ["src/pg/patterns"]
 		},
+		{
+			"path": "./src/pg/patterns"
+		}
 	],
 }

prepros.config

@@ -492,6 +492,9 @@
         "resolveJsonModule": false,
         "esModuleInterop": false,
         "useDefineForClassFields": false
+      },
+      "custom-gzg6caunrh": {
+        "command": "cp {{input}} {{output}}"
       }
     },
     "fileTypes": {
@@ -955,6 +958,26 @@
           "type": "SOURCE_RELATIVE",
           "relativePath": ""
         }
+      },
+      "custom-sm9kzo2npr": {
+        "autoCompile": true,
+        "label": "Pug pattern to pug file",
+        "extensions": [
+          ".pp"
+        ],
+        "tasks": [
+          {
+            "task": "custom-gzg6caunrh",
+            "enable": true
+          }
+        ],
+        "output": {
+          "extension": ".pug",
+          "type": "SOURCE_RELATIVE",
+          "relativePath": "",
+          "suffix": "-dist",
+          "alwaysSuffix": false
+        }
       }
     },
     "files": [
@@ -1191,6 +1214,7 @@
               }
             },
             "minify-js": {
+              "enable": false,
               "options": {
                 "toplevel": true
               }
@@ -1345,6 +1369,30 @@
           }
         }
       },
+      {
+        "file": "src/pg/patterns/core/sticky-note/_sticky-note.pp",
+        "config": {
+          "autoCompile": true
+        }
+      },
+      {
+        "file": "src/pg/patterns/core/switch/_switch.pp",
+        "config": {
+          "autoCompile": true
+        }
+      },
+      {
+        "file": "src/pg/patterns/core/tabs/_tabs.pp",
+        "config": {
+          "autoCompile": true
+        }
+      },
+      {
+        "file": "src/pg/patterns/core/tooltip/_tooltip.pp",
+        "config": {
+          "autoCompile": true
+        }
+      },
       {
         "file": "src/pg/patterns/layouts/header-core/header.scss",
         "config": {
@@ -1494,16 +1542,6 @@
         "config": {
           "customOutput": "src/scss/_status.scss"
         }
-      },
-      {
-        "file": "src/scss/scaffolding.scss",
-        "config": {
-          "tasks": {
-            "minify-css": {
-              "enable": false
-            }
-          }
-        }
       }
     ]
   }

public/download.php

@@ -0,0 +1,52 @@
+<?php 
+	function recursor($dir, $type) {
+		$result = array();
+
+		// create the pattern to get the type
+		$x = "/_*.";
+		for ($i = 0; $i < strlen($type); $i++){
+			$x .= "[" . strtolower($type[$i]) . strtoupper($type[$i]) ."]";
+		}
+
+		// get the directories
+		foreach(glob($dir . "/*") as $d) {
+			if ( is_dir( $d ) ) {
+
+				// find the files in each directory
+				foreach (glob($d . $x) as $f) {
+					$result[] = $f;
+				}
+				// $more = recursor($d, $type);
+				// $result = array_merge($result, $more);
+				$result = array_merge($result, recursor($d, $type));
+			}
+		}
+		return $result;
+	}
+
+	$allowed_types = ["scss", "js"];
+	$patterns = dirname(dirname(__file__)) . "/src/pg/patterns";
+
+
+	if (!isset($_SERVER['QUERY_STRING']) || !in_array($_SERVER['QUERY_STRING'], $allowed_types)) {
+		echo "File extension type is not defined. Ensure that you have added ?[file extension] to the URL. If you have defined a file extension and it is not allowed, you'll need to contact the an administrator to get the requested files.";
+		die();
+	}
+
+	$type = $_SERVER['QUERY_STRING'];
+
+	$file_list = recursor($patterns, $type);
+
+	$f = tmpfile();
+	$t = stream_get_meta_data($f)['uri'];
+	$z = new ZipArchive();
+
+	$zf = $z->open($t, ZipArchive::CREATE);
+	foreach($file_list as $f) {
+		$z->addFile($f, preg_replace('/^.*?patterns\//', '', $f));
+	}
+	$z->close();
+
+	header('Content-type: application/zip');
+	header(sprintf('Content-Disposition: attachment; filename="%s.zip"', $type));
+	echo(file_get_contents($t)); ?>

public/index.html

@@ -8,9 +8,14 @@
     <link rel="icon" href="https://assets.gamv.ca/favicon.svg" media="(prefers-color-scheme:no-preference),(prefers-color-scheme:light)">
     <link rel="icon" href="https://assets.gamv.ca/favicon-dark.svg" media="(prefers-color-scheme:dark)">
     <link href="assets/scaffolding.css" rel="stylesheet">
-    <script src="assets/jquery-min.js"></script>
   </head>
-  <body><a class="skip" href="#main">Skip to main content</a>
+  <body>
+    <!--		
+    DS2 core (c) 2024 Alexander McIlwraith 
+    Core licensed under CC BY-SA 4.0 
+    
+    
+    --><a class="skip" href="#main">Skip to main content</a>
     <div class="container">
       <header>
         <!-- The headline banner area -->
@@ -19,67 +24,67 @@
         </svg>
         <div>
           <div class="header-title">
-            <h1> <a>DS2 core</a></h1>
+            <h1> <a href="./">DS2 core</a></h1>
           </div>
           <!-- Other sections can go here, such as search and directory-->
         </div>
       </header>
       <nav>
         <ul>
-          <li> <a href="./">Home</a></li>
+          <li><a href="./?p=this-pattern-doesnt-exist">This pattern doesn't exist</a></li>
-          <li><a href="./?p=this-pattern-doesn't-exist">This pattern doesn't exist</a></li>
           <li><a href="./?p=colours">Colours</a></li>
           <li><a href="./?p=components">Components</a></li>
           <li><a href="./?p=layouts">Layouts</a></li>
           <li><a href="./?p=status">Status</a></li>
         </ul>
       </nav>
-      <p class="deprecated-switch"><span></span><span id="deprecated" role="switch"></span>
+      <p class="info-switches"><span></span><span id="deprecated" role="switch"></span>
-        <label for="deprecated">Show deprecated patterns</label>
+        <label for="deprecated">Show deprecated patterns</label><span></span><span id="breakpoints" role="switch"></span>
+        <label for="breakpoints">Show breakpoint information</label>
       </p>
       <main id="main">
         <h1>DS2 core</h1>
-        <article class="status-deprecated" id="this-pattern-doesn't-exist" data-path="this-pattern-doesn't-exist" data-template="pug" data-pattern="this-pattern-doesn't-exist" data-status="deprecated" data-core="false">
+        <article id="this-pattern-doesnt-exist" data-name="this pattern doesn't exist" data-status="deprecated" data-template="pug" data-core="false" data-path="this-pattern-doesnt-exist" style="height: 100vh">
           <h1 class="status-deprecated"><span>This pattern doesn't exist
               <tool-tip role="tooltip" inert="inert" tip-position="right">Deprecated</tool-tip></span></h1>
         </article>
-        <article id="colours" data-path="colours" data-template="pug" data-pattern="colours" data-status="complete" data-core="true">
+        <article id="colours" data-name="colours" data-status="complete" data-template="pug" data-core="true" data-path="colours" style="height: 100vh">
           <h1 class="status-complete"><span>Colours
               <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="components" data-path="components" data-template="none" data-pattern="components" data-status="complete" data-core="false">
+        <article id="components" data-name="components" data-status="complete" data-template="none" data-core="false" data-path="components" style="height: 100vh">
           <h1 class="status-complete"><span>Components
               <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="components-sticky-note" data-path="components/sticky-note" data-template="pug" data-pattern="sticky-note" data-status="in-progress" data-core="true">
+        <article id="components-sticky-note" data-name="sticky-note" data-status="complete" data-template="pug" data-core="true" data-path="components/sticky-note" style="height: 100vh">
-          <h1 class="status-in-progress"><span>Sticky note
+          <h1 class="status-complete"><span>Sticky note
-              <tool-tip role="tooltip" inert="inert" tip-position="right">In progress</tool-tip></span></h1>
+              <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="components-switch" data-path="components/switch" data-template="pug" data-pattern="switch" data-status="in-progress" data-core="true">
+        <article id="components-switch" data-name="switch" data-status="complete" data-template="pug" data-core="true" data-path="components/switch" style="height: 100vh">
-          <h1 class="status-in-progress"><span>Switch
+          <h1 class="status-complete"><span>Switch
-              <tool-tip role="tooltip" inert="inert" tip-position="right">In progress</tool-tip></span></h1>
+              <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="components-tooltip" data-path="components/tooltip" data-template="pug" data-pattern="tooltip" data-status="in-progress" data-core="true">
+        <article id="components-tooltip" data-name="tooltip" data-status="complete" data-template="pug" data-core="true" data-path="components/tooltip" style="height: 100vh">
-          <h1 class="status-in-progress"><span>Tooltip
+          <h1 class="status-complete"><span>Tooltip
-              <tool-tip role="tooltip" inert="inert" tip-position="right">In progress</tool-tip></span></h1>
+              <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="layouts" data-path="layouts" data-template="none" data-pattern="layouts" data-status="complete" data-core="true">
+        <article id="layouts" data-name="layouts" data-status="complete" data-template="none" data-core="true" data-path="layouts" style="height: 100vh">
           <h1 class="status-complete"><span>Layouts
               <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="layouts-header" data-path="layouts/header" data-template="pug" data-pattern="header" data-status="in-progress" data-core="true">
+        <article id="layouts-header" data-name="header" data-status="complete" data-template="pug" data-core="true" data-path="layouts/header" style="height: 100vh">
-          <h1 class="status-in-progress"><span>Header
+          <h1 class="status-complete"><span>Header
-              <tool-tip role="tooltip" inert="inert" tip-position="right">In progress</tool-tip></span></h1>
+              <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="layouts-breakpoints" data-path="layouts/breakpoints" data-template="pug" data-pattern="breakpoints" data-status="in-progress" data-core="true">
+        <article id="layouts-breakpoints" data-name="breakpoints" data-status="complete" data-template="pug" data-core="true" data-path="layouts/breakpoints" style="height: 100vh">
-          <h1 class="status-in-progress"><span>Breakpoints
+          <h1 class="status-complete"><span>Breakpoints
-              <tool-tip role="tooltip" inert="inert" tip-position="right">In progress</tool-tip></span></h1>
+              <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="layouts-tabs" data-path="layouts/tabs" data-template="pug" data-pattern="tabs" data-status="complete" data-core="true">
+        <article id="layouts-tabs" data-name="tabs" data-status="complete" data-template="pug" data-core="true" data-path="layouts/tabs" style="height: 100vh">
           <h1 class="status-complete"><span>Tabs
               <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>
-        <article id="status" data-path="status" data-template="pug" data-pattern="status" data-status="complete" data-core="true">
+        <article id="status" data-name="status" data-status="complete" data-template="pug" data-core="true" data-path="status" style="height: 100vh">
           <h1 class="status-complete"><span>Status
               <tool-tip role="tooltip" inert="inert" tip-position="right">Complete</tool-tip></span></h1>
         </article>

public/patterns/core/breakpoints/index.html

@@ -5,8 +5,12 @@
   </head>
   <body data-prismjs-copy-timeout="1500">
     <h2>What is it</h2>
+    <p>Breakpoints enable responsive mobile design.</p>
     <h2>When to use it</h2>
+    <p>Use breakpoints when designing for different screen sizes. </p>
+    <p>The breakpoints SCSS mixin included implements media queries to allow for the change of the layout and design based on pre-defined screen sizes. </p>
     <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>
     <div class="tab-group" id="breakpoints">
       <pre class="language-css" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 

public/patterns/core/colours/index.html

@@ -4,7 +4,14 @@
     <title>Pattern</title>
   </head>
   <body data-prismjs-copy-timeout="1500">
-    <h2>Primary colours</h2>
+    <h2>What is it</h2>
+    <p>Colours are used to represent your site and are an implementation of your brand's visual identity. </p>
+    <h2>When to use it</h2>
+    <p>Colours are used throughout your patterns. </p>
+    <h2>How to use it</h2>
+    <p>Hover over the colour gradient sample pills to view the accessibility information for each colour sample against black and white. </p>
+    <p>Click on the colour name or the colour gradient sample pills to copy the colour to your clipboard. A regular click will copy the hex code, a shift+click will copy the RGB code, the alt key (or Mac option&nbsp;&#8997; key) will copy the colour token, and the meta key (Windows key or Mac command&nbsp;&#8984; key) will copy a CSS colour var. </p>
+    <h3>Primary colours</h3>
         <color-samples>
           <color-sample data-color="rgb( 46,  81, 161)" style="background-color: rgb( 46,  81, 161); color: #FFF"> 
             <name data-hex="#2e51a1" data-rgb="rgb( 46,  81, 161)" data-token="--colour-blue"><span>Blue</span></name>

public/patterns/core/header/index.html

@@ -4,6 +4,12 @@
     <title>Pattern</title>
   </head>
   <body data-prismjs-copy-timeout="1500">
+    <h2>What is it</h2>
+    <p>A header is layout pattern that helps the user identify the site.  </p>
+    <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. This basic header should be replaced with your own site's header. </p>
     <div class="tab-group" id="header">
       <pre class="language-html" data-tab="html">
         <!-- create temp variables and store the design system values-->
@@ -14,11 +20,94 @@
           </svg>
           <div>
             <div class="header-title">
-              <h1> <a href="[site root]">[site name]</a></h1>
+              <h1> <a href="./">[site name]</a></h1>
             </div>
             <!-- Other sections can go here, such as search and directory-->
           </div>
         </header></pre>
+      <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
+//- site - the site name that goes in the site title
+//- root - the path to the root of the site
+
+header
+	// The headline banner area 
+	svg(height='5.5rem' width='100%' xmlns='http://www.w3.org/2000/svg' aria-hidden='true')
+		text= site
+	div
+		div.header-title
+			h1 
+				a(href="./")= site
+		// Other sections can go here, such as search and directory
+</pre>
+      <pre class="language-css" data-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-sass" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
@@ -72,59 +161,6 @@ $font-weight: 700 !default;
 			}
 		}
 	}
-}</pre>
-      <pre class="language-css" data-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>
     </div>
   </body>

public/patterns/core/status/index.html

@@ -12,7 +12,7 @@
               <td colspan="2">This pattern doesn't exist (1)</td>
             </tr>
             <tr>
-              <td><a href="./?p=this-pattern-doesn't-exist"> This pattern doesn't exist</a></td>
+              <td><a href="./?p=this pattern doesn't exist"> This pattern doesn't exist</a></td>
               <td><span class="status-deprecated">Deprecated</span></td>
             </tr>
             <tr>
@@ -30,15 +30,15 @@
               <td><span class="status-complete">Complete</span></td>
               <tr>
                 <td><a href="./?p=components/sticky-note"> Sticky note</a></td>
-                <td><span class="status-in-progress">In progress</span></td>
+                <td><span class="status-complete">Complete</span></td>
               </tr>
               <tr>
                 <td><a href="./?p=components/switch"> Switch</a></td>
-                <td><span class="status-in-progress">In progress</span></td>
+                <td><span class="status-complete">Complete</span></td>
               </tr>
               <tr>
                 <td><a href="./?p=components/tooltip"> Tooltip</a></td>
-                <td><span class="status-in-progress">In progress</span></td>
+                <td><span class="status-complete">Complete</span></td>
               </tr>
             </tr>
             <tr>
@@ -49,11 +49,11 @@
               <td><span class="status-complete">Complete</span></td>
               <tr>
                 <td><a href="./?p=layouts/header"> Header</a></td>
-                <td><span class="status-in-progress">In progress</span></td>
+                <td><span class="status-complete">Complete</span></td>
               </tr>
               <tr>
                 <td><a href="./?p=layouts/breakpoints"> Breakpoints</a></td>
-                <td><span class="status-in-progress">In progress</span></td>
+                <td><span class="status-complete">Complete</span></td>
               </tr>
               <tr>
                 <td><a href="./?p=layouts/tabs"> Tabs</a></td>
@@ -77,31 +77,15 @@
               <td colspan="2"><span class="status-not-started">Not started (0)</span></td>
             </tr>
             <tr> 
-              <td colspan="2"><span class="status-in-progress">In progress (5)</span></td>
+              <td colspan="2"><span class="status-in-progress">In progress (0)</span></td>
+            </tr>
+            <tr> 
+              <td colspan="2"><span class="status-complete">Complete (10)</span></td>
             </tr>
             <tr> 
               <td> <a href="./?p=layouts/breakpoints">Breakpoints</a></td>
               <td>Layouts</td>
             </tr>
-            <tr> 
-              <td> <a href="./?p=layouts/header">Header</a></td>
-              <td>Layouts</td>
-            </tr>
-            <tr> 
-              <td> <a href="./?p=components/sticky-note">Sticky note</a></td>
-              <td>Components</td>
-            </tr>
-            <tr> 
-              <td> <a href="./?p=components/switch">Switch</a></td>
-              <td>Components</td>
-            </tr>
-            <tr> 
-              <td> <a href="./?p=components/tooltip">Tooltip</a></td>
-              <td>Components</td>
-            </tr>
-            <tr> 
-              <td colspan="2"><span class="status-complete">Complete (5)</span></td>
-            </tr>
             <tr> 
               <td> <a href="./?p=colours">Colours</a></td>
               <td></td>
@@ -110,6 +94,10 @@
               <td> <a href="./?p=components">Components</a></td>
               <td></td>
             </tr>
+            <tr> 
+              <td> <a href="./?p=layouts/header">Header</a></td>
+              <td>Layouts</td>
+            </tr>
             <tr> 
               <td> <a href="./?p=layouts">Layouts</a></td>
               <td></td>
@@ -118,15 +106,27 @@
               <td> <a href="./?p=status">Status</a></td>
               <td></td>
             </tr>
+            <tr> 
+              <td> <a href="./?p=components/sticky-note">Sticky note</a></td>
+              <td>Components</td>
+            </tr>
+            <tr> 
+              <td> <a href="./?p=components/switch">Switch</a></td>
+              <td>Components</td>
+            </tr>
             <tr> 
               <td> <a href="./?p=layouts/tabs">Tabs</a></td>
               <td>Layouts</td>
             </tr>
+            <tr> 
+              <td> <a href="./?p=components/tooltip">Tooltip</a></td>
+              <td>Components</td>
+            </tr>
             <tr> 
               <td colspan="2"><span class="status-deprecated">Deprecated (1)</span></td>
             </tr>
             <tr> 
-              <td> <a href="./?p=this-pattern-doesn't-exist">This pattern doesn't exist</a></td>
+              <td> <a href="./?p=this pattern doesn't exist">This pattern doesn't exist</a></td>
               <td></td>
             </tr>
           </tbody>
@@ -137,7 +137,7 @@
           <tbody> 
             <tr> 
               <td> <a href="./?p=layouts/breakpoints">Breakpoints</a></td>
-              <td><span><span class="status-in-progress">In Progress</span></span></td>
+              <td><span><span class="status-complete">Complete</span></span></td>
               <td>Layouts</td>
             </tr>
             <tr> 
@@ -152,7 +152,7 @@
             </tr>
             <tr> 
               <td> <a href="./?p=layouts/header">Header</a></td>
-              <td><span><span class="status-in-progress">In Progress</span></span></td>
+              <td><span><span class="status-complete">Complete</span></span></td>
               <td>Layouts</td>
             </tr>
             <tr> 
@@ -167,12 +167,12 @@
             </tr>
             <tr> 
               <td> <a href="./?p=components/sticky-note">Sticky note</a></td>
-              <td><span><span class="status-in-progress">In Progress</span></span></td>
+              <td><span><span class="status-complete">Complete</span></span></td>
               <td>Components</td>
             </tr>
             <tr> 
               <td> <a href="./?p=components/switch">Switch</a></td>
-              <td><span><span class="status-in-progress">In Progress</span></span></td>
+              <td><span><span class="status-complete">Complete</span></span></td>
               <td>Components</td>
             </tr>
             <tr> 
@@ -181,13 +181,13 @@
               <td>Layouts</td>
             </tr>
             <tr> 
-              <td> <a href="./?p=this-pattern-doesn't-exist">This pattern doesn't exist</a></td>
+              <td> <a href="./?p=this pattern doesn't exist">This pattern doesn't exist</a></td>
               <td><span><span class="status-deprecated">Deprecated</span></span></td>
               <td></td>
             </tr>
             <tr> 
               <td> <a href="./?p=components/tooltip">Tooltip</a></td>
-              <td><span><span class="status-in-progress">In Progress</span></span></td>
+              <td><span><span class="status-complete">Complete</span></span></td>
               <td>Components</td>
             </tr>
           </tbody>

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

@@ -5,15 +5,20 @@
   </head>
   <body data-prismjs-copy-timeout="1500">
     <h2>What is it</h2>
+    <p>Sticky notes provide a way to attach information. They are a DS2 core pattern for making notes. </p>
     <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. 
-      <sticky-note class="blue" float="right">This <strong>is</strong> a test</sticky-note>You might need to add relative positioning to it's container. 
+      <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>
     </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>another one</sticky-note>
+    <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>
-    <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>
+    <tabset id="sticky-note">
-    <div class="tab-group" 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;
@@ -423,6 +428,6 @@ export function init(p = document){
 		});
 	}
 }</pre>
-    </div>
+    </tabset>
   </body>
 </html>

public/patterns/core/switch/index.html

@@ -5,11 +5,15 @@
   </head>
   <body data-prismjs-copy-timeout="1500">
     <h2>What is it</h2>
+    <p>Switches are used to toggle application state between two mutually exclusive values. </p>
     <h2>When to use it</h2>
+    <p>Use a switch when the user will see an immediate visible state change. Do not use a switch when the state change will affect future results. The user should not have to perform another action (search, save, etc) for the result to take affect. If the change in state does not take effect immediately, consider a checkbox. </p>
     <h2>How to use it</h2>
+    <p>The switch label should describe what will happen when the switch is turned to the on state. Frontload labels with keywords. </p>
+    <p>Include the CSS and JavaScript. An additional handler will need to be created for the actual state change. The CSS implements the visual design of the switch, which is based on the accessibility properties, which are implemented by the JavaScript.</p>
     <h2>Example</h2>
     <p class="switch">
-      <label for="example-switch">Switch label</label><span id="example-switch" role="switch"></span>
+      <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" data-tab="html"><span id="example-id" role="switch"></span></pre>
@@ -45,9 +49,9 @@
 
 @use "sass:math";
 
-$switch-accent: var(--colour-blue) !default;     // switch background when switched right (on/ true)
+$switch-accent: #2e51a1 !default;     // switch background when switched right (on/ true)
-$switch-background: var(--colour-grey-xl) !default;   // switch background when switched left (off / false)
+$switch-background: #d8d8d8 !default;   // switch background when switched left (off / false)
-$switch-color: var(--colour-white) !default;    // the colour of the switch
+$switch-color: white !default;    // the colour of the switch
 $switch-height: 1.5rem !default;
 
 @mixin switch {  
@@ -91,19 +95,18 @@ function flip(e) {
 	}
 };
 
-
+module.exports = {
-function init(callback){
+	init: (p = document) => {
-	let sw = document.querySelectorAll("[role='switch']");
+		p.querySelectorAll("[role='switch']").forEach((sw) => {
-	for (let i=0; i < sw.length; i++) {
+			sw.innerHTML = "<span></span>";
-		sw[i].innerHTML = "<span></span>";
+			sw.setAttribute("aria-checked", "false");
-		sw[i].setAttribute("aria-checked", "false");
+			sw.setAttribute("tabindex", "0");
-		sw[i].setAttribute("tabindex", "0");
+			sw.addEventListener("click", flip, false);
-		sw[i].addEventListener("click", flip, false);
+			sw.addEventListener("keypress", flip, false);
-		sw[i].addEventListener("keypress", flip, false);
+		})
 	}
 }
-
+</pre>
-export {init};</pre>
     </div>
   </body>
 </html>

public/patterns/core/tabs/index.html

@@ -5,7 +5,7 @@
   </head>
   <body data-prismjs-copy-timeout="1500">
     <h2>What is it</h2>
-    <h2>When to use 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>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> 
@@ -15,13 +15,18 @@
       <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>When to use it</h2>
     <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>
     <tabset id="tabs">
       <pre class="language-html" tab="html">
-        <div class="tab-group" id="uniqueID">
+        <tabset id="uniqueID">
-          <div data-tab="[tab title]"></div>
+          <div tab="[tab title]"></div>
-          <div data-tab="[tab title]"></div>
+          <div tab="[tab title]"></div>
-        </div></pre>
+        </tabset></pre>
+      <pre class="language-pug" tab="pug">tabset#uniqueID
+	div(tab="[tab title]")
+	div(tab="[tab title]")
+		</pre>
       <pre class="language-css" tab="css">tabset, .tab-group {
 	margin: 2rem 0 1rem 0;
 }
@@ -77,9 +82,9 @@ tabset [role=tabpanel]:not(.open), .tab-group [role=tabpanel]:not(.open) {
       <pre class="language-css" tab="scss">//		DS2 core (c) 2024 Alexander McIlwraith 
 //		Licensed under CC BY-SA 4.0 
 
-$tab-border: var(--colour-grey) !default; 
+$tab-border: #7f7f7f !default; 
-$tab-selected: var(--colour-white) !default;
+$tab-selected: #FFF !default;
-$tab-notselected: var(--colour-grey-xxl) !default;
+$tab-notselected: #f0f0f0 !default;
 
 @mixin tabs {
 	tabset, .tab-group {

public/patterns/core/tooltip/index.html

@@ -0,0 +1,361 @@
+
+<html> 
+  <head>
+    <title>Pattern</title>
+  </head>
+  <body data-prismjs-copy-timeout="1500">
+    <h2>What is it</h2>
+    <p>Tooltips provide brief information messaging through a mouse or keyboard hover. </p>
+    <h2>When to use it</h2>
+    <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. </p>
+    <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. 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>
+    <p>Tool tip positions are: </p>
+    <ul> 
+      <li>top / block-start</li>
+      <li>right / inline-end</li>
+      <li>bottom / block-end</li>
+      <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>
+    <div class="tab-group" id="tooltip">
+      <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" 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" data-tab="css">/* Position Options
+	- top / block-start
+	- right / inline-end
+	- bottom / block-end
+	- left / inline-start
+*/
+[role=tooltip] {
+	background: #fff;
+	border-radius: 0.5rem;
+	color: #000;
+	-webkit-filter: drop-shadow(0 3px 3px hsla(0, 0%, 0%, 0.15)) drop-shadow(0 12px 12px hsla(0, 0%, 0%, 0.15));
+	        filter: drop-shadow(0 3px 3px hsla(0, 0%, 0%, 0.15)) drop-shadow(0 12px 12px hsla(0, 0%, 0%, 0.15));
+	font-size: 1rem;
+	font-weight: 400;
+	inline-size: -webkit-max-content;
+	inline-size: -moz-max-content;
+	inline-size: max-content;
+	line-height: initial;
+	margin: 0;
+	max-inline-size: 25rem;
+	opacity: 0;
+	padding: 0.75rem 1.5rem;
+	pointer-events: none;
+	position: absolute;
+	text-align: start;
+	-webkit-transform: translate(var(--tooltip-x, 0)) translateY(var(--tooltip-y, 0));
+	    -ms-transform: translate(var(--tooltip-x, 0)) translateY(var(--tooltip-y, 0));
+	        transform: translate(var(--tooltip-x, 0)) translateY(var(--tooltip-y, 0));
+	-webkit-transition: opacity 0.2s ease, -webkit-transform 0.2s ease;
+	transition: opacity 0.2s ease, -webkit-transform 0.2s ease;
+	transition: opacity 0.2s ease, transform 0.2s ease;
+	transition: opacity 0.2s ease, transform 0.2s ease, -webkit-transform 0.2s ease;
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	    -ms-user-select: none;
+	        user-select: none;
+	will-change: filter;
+	z-index: 10;
+}
+[role=tooltip]::before {
+	clip-path: inset(50%);
+	clip: rect(1px, 1px, 1px, 1px);
+	content: "; Has tooltip: ";
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+[role=tooltip]::after {
+	background: #fff;
+	content: "";
+	inset: 0;
+	-webkit-mask: var(--tooltip-pointer);
+	        mask: var(--tooltip-pointer);
+	position: absolute;
+	z-index: -1;
+}
+[role=tooltip]:is([tip-position=top],
+[tip-position=block-start],
+:not([tip-position]),
+[tip-position=bottom],
+[tip-position=block-end]) {
+	text-align: center;
+}
+[role=tooltip]:is([tip-position=top],
+[tip-position=block-start],
+:not([tip-position])) {
+	inset-inline-start: 50%;
+	inset-block-end: calc(100% + 0.75rem + 1rem);
+	--tooltip-x: calc(50% * -1);
+}
+[role=tooltip]:is([tip-position=top],
+[tip-position=block-start],
+:not([tip-position]))::after {
+	--tooltip-pointer: conic-gradient(from -30deg at bottom, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) bottom/100% 50% no-repeat;
+	inset-block-end: -1rem;
+	-webkit-border-after: 1rem solid transparent;
+	        border-block-end: 1rem solid transparent;
+}
+[role=tooltip]:is([tip-position=right],
+[tip-position=inline-end]) {
+	inset-inline-start: calc(100% + 1.5rem + 1rem);
+	inset-block-end: 50%;
+	--tooltip-y: 50%;
+}
+[role=tooltip]:is([tip-position=right],
+[tip-position=inline-end])::after {
+	--tooltip-pointer: conic-gradient(from 60deg at left, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) left/50% 100% no-repeat;
+	inset-inline-start: -1rem;
+	-webkit-border-start: 1rem solid transparent;
+	        border-inline-start: 1rem solid transparent;
+}
+[role=tooltip]:is([tip-position=bottom],
+[tip-position=block-end]) {
+	inset-inline-start: 50%;
+	inset-block-start: calc(100% + 0.75rem + 1rem);
+	--tooltip-x: calc(50% * -1);
+}
+[role=tooltip]:is([tip-position=bottom],
+[tip-position=block-end])::after {
+	--tooltip-pointer: conic-gradient(from 150deg at top, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) top/100% 50% no-repeat;
+	inset-block-start: -1rem;
+	-webkit-border-before: 1rem solid transparent;
+	        border-block-start: 1rem solid transparent;
+}
+[role=tooltip]:is([tip-position=left],
+[tip-position=inline-start]) {
+	inset-inline-end: calc(100% + 1.5rem + 1rem);
+	inset-block-end: 50%;
+	--tooltip-y: 50%;
+}
+[role=tooltip]:is([tip-position=left],
+[tip-position=inline-start])::after {
+	--tooltip-pointer: conic-gradient(from -120deg at right, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) right/50% 100% no-repeat;
+	inset-inline-end: -1rem;
+	-webkit-border-end: 1rem solid transparent;
+	border-inline-end: 1rem solid transparent;
+}
+@media (prefers-color-scheme: dark) {
+	[role=tooltip] {
+		background: #1f2127;
+		color: #fff;
+		-webkit-filter: drop-shadow(0 3px 3px hsla(0, 0%, 0%, 0.5)) drop-shadow(0 12px 12px hsla(0, 0%, 0%, 0.5));
+		        filter: drop-shadow(0 3px 3px hsla(0, 0%, 0%, 0.5)) drop-shadow(0 12px 12px hsla(0, 0%, 0%, 0.5));
+	}
+	[role=tooltip]::after {
+		background: #1f2127;
+	}
+}
+
+:has(> [role=tooltip]) {
+	position: relative;
+}
+:has(> [role=tooltip]):is(:hover, :focus-visible, :active) > [role=tooltip] {
+	opacity: 1;
+	-webkit-transition-delay: 300ms;
+	        transition-delay: 300ms;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+	:has(> [role=tooltip]:is([tip-position=top], [tip-position=block-start], :not([tip-position]))):not(:hover):not(:active) [role=tooltip] {
+		--tooltip-y: 3px;
+	}
+	:has(> [role=tooltip]:is([tip-position=right], [tip-position=inline-end])):not(:hover):not(:active) [role=tooltip] {
+		--tooltip-x: calc(-1 * -3px * -1);
+	}
+	:has(> [role=tooltip]:is([tip-position=bottom], [tip-position=block-end])):not(:hover):not(:active) [role=tooltip] {
+		--tooltip-y: -3px;
+	}
+	:has(> [role=tooltip]:is([tip-position=left], [tip-position=inline-start])):not(:hover):not(:active) [role=tooltip] {
+		--tooltip-x: calc(-1 * 3px * -1);
+	}
+}</pre>
+      <pre class="language-css" data-tab="scss">//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Licensed under CC BY-SA 4.0 
+
+$tooltip-border-radius: .5rem !default;
+$tooltip-dark-allow: true !default;
+$tooltip-dark-background: #1f2127 !default;
+$tooltip-dark-drop-shadow: drop-shadow(0 3px 3px hsl(0 0% 0% / 50%)) drop-shadow(0 12px 12px hsl(0 0% 0% / 50%)) !default;
+$tooltip-dark-foreground: #fff !default;
+$tooltip-light-background: #fff !default;
+$tooltip-light-drop-shadow: drop-shadow(0 3px 3px hsl(0 0% 0% / 15%)) drop-shadow(0 12px 12px hsl(0 0% 0% / 15%)) !default;
+$tooltip-light-foreground: #000 !default;
+$tooltip-padding-sides: 1.5rem !default;
+$tooltip-padding-top-bottom: 0.75rem !default;
+$tooltip-pointer-size: 1rem !default;
+$tooltip-pointer-bottom: conic-gradient(from -30deg at bottom, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) bottom / 100% 50% no-repeat !default;
+$tooltip-pointer-left: conic-gradient(from 60deg at left, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) left / 50% 100% no-repeat !default;
+$tooltip-pointer-right: conic-gradient(from -120deg at right, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) right / 50% 100% no-repeat !default;
+$tooltip-pointer-top: conic-gradient(from 150deg at top, rgba(0, 0, 0, 0), #000 1deg 60deg, rgba(0, 0, 0, 0) 61deg) top / 100% 50% no-repeat !default;
+/* Position Options
+	- top / block-start
+	- right / inline-end
+	- bottom / block-end
+	- left / inline-start
+*/
+
+@mixin tooltip {
+	[role="tooltip"] {
+		background: $tooltip-light-background;
+		border-radius: $tooltip-border-radius;
+		color: $tooltip-light-foreground;
+		filter: $tooltip-light-drop-shadow;
+		font-size: 1rem;
+		font-weight: 400;
+		inline-size: max-content;
+		line-height: initial;
+		margin: 0;
+		max-inline-size: 25rem;
+		opacity: 0;
+		padding: $tooltip-padding-top-bottom $tooltip-padding-sides;
+		pointer-events: none;
+		position: absolute;
+		text-align: start;
+		transform: translate(var(--tooltip-x, 0)) translateY(var(--tooltip-y, 0));
+		transition: opacity 0.2s ease, transform 0.2s ease;
+		user-select: none;
+		will-change: filter;
+		z-index: 10;
+	
+		&::before {
+			clip-path: inset(50%);
+			clip: rect(1px, 1px, 1px, 1px);
+			content: "; Has tooltip: ";
+			height: 1px;
+			margin: -1px;
+			overflow: hidden;
+			padding: 0;
+			position: absolute;
+			width: 1px;
+		}
+
+		&::after {
+			background: $tooltip-light-background;
+			content: "";
+			inset: 0;
+			mask: var(--tooltip-pointer);
+			position: absolute;
+			z-index: -1;
+		}
+
+		&:is(	[tip-position="top"], 
+				[tip-position="block-start"], 
+				:not([tip-position]), 
+				[tip-position="bottom"], 
+				[tip-position="block-end"]
+			) {
+				text-align: center;
+		}
+
+		&:is(	[tip-position="top"], 
+				[tip-position="block-start"], 
+				:not([tip-position])
+			) {
+				inset-inline-start: 50%;
+				inset-block-end: calc(100% + $tooltip-padding-top-bottom + $tooltip-pointer-size);
+				--tooltip-x: calc(50% * -1);
+
+				&::after {
+					--tooltip-pointer: #{$tooltip-pointer-bottom};
+					inset-block-end: calc($tooltip-pointer-size * -1);
+					border-block-end: $tooltip-pointer-size solid transparent;
+				}
+		}
+
+		&:is(	[tip-position="right"], 
+				[tip-position="inline-end"]
+			) {
+				inset-inline-start: calc(100% + $tooltip-padding-sides + $tooltip-pointer-size);
+				inset-block-end: 50%;
+				--tooltip-y: 50%;
+
+				&::after {
+					--tooltip-pointer: #{$tooltip-pointer-left};
+					inset-inline-start: calc($tooltip-pointer-size * -1);
+					border-inline-start: $tooltip-pointer-size solid transparent;
+				}
+		}
+
+
+		&:is(	[tip-position="bottom"], 
+				[tip-position="block-end"]
+			) {
+				inset-inline-start: 50%;
+				inset-block-start: calc(100% + $tooltip-padding-top-bottom + $tooltip-pointer-size);
+				--tooltip-x: calc(50% * -1);
+
+				&::after {
+					--tooltip-pointer: #{$tooltip-pointer-top};
+					inset-block-start: calc($tooltip-pointer-size * -1);
+					border-block-start: $tooltip-pointer-size solid transparent;
+				}
+		}
+
+
+		&:is(	[tip-position="left"], 
+				[tip-position="inline-start"]
+			) {
+				inset-inline-end: calc(100% + $tooltip-padding-sides + $tooltip-pointer-size);
+				inset-block-end: 50%;
+				--tooltip-y: 50%;
+
+				&::after {
+					--tooltip-pointer: #{$tooltip-pointer-right};
+					inset-inline-end: calc($tooltip-pointer-size * -1);
+					-webkit-border-end: $tooltip-pointer-size solid transparent;
+					border-inline-end: $tooltip-pointer-size solid transparent;
+				}
+		}
+		@if ($tooltip-dark-allow == true ) {	
+			@media (prefers-color-scheme: dark) {
+				background: $tooltip-dark-background;
+				color: $tooltip-dark-foreground;
+				filter: $tooltip-dark-drop-shadow;
+				&::after {
+					background: $tooltip-dark-background;
+				}
+			}
+		}
+	}
+
+	:has(> [role="tooltip"]) {
+		position: relative;
+		&:is(:hover, :focus-visible, :active) > [role="tooltip"] {
+			opacity: 1;
+			transition-delay: 300ms;
+		}
+	}
+
+	@media (prefers-reduced-motion: no-preference) {
+
+		:has(> [role="tooltip"]:is([tip-position="top"], [tip-position="block-start"], :not([tip-position]))):not(:hover):not(:active) [role="tooltip"] {
+			--tooltip-y: 3px;
+		}
+
+		:has(> [role="tooltip"]:is([tip-position="right"], [tip-position="inline-end"])):not(:hover):not(:active) [role="tooltip"] {
+			--tooltip-x: calc(-1 * -3px * -1);
+		}
+
+		:has(> [role="tooltip"]:is([tip-position="bottom"], [tip-position="block-end"])):not(:hover):not(:active) [role="tooltip"] {
+			--tooltip-y: -3px;
+		}
+
+		:has(> [role="tooltip"]:is([tip-position="left"], [tip-position="inline-start"])):not(:hover):not(:active) [role="tooltip"] {
+			--tooltip-x: calc(-1 * 3px * -1);
+		}
+
+	}
+}</pre>
+    </div>
+  </body>
+</html>

src/js/core/_core.js

@@ -1,16 +1,25 @@
+const getDate = function(){
+	var d = new Date();
+	return d.toLocaleDateString(lang, {day: "numeric", month: "long", year: "numeric"});
+}
 String.prototype.toTitleCase = function() {
 	return this.replace(/\w\S*/g, function(txt) {
-		return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+     return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-	});
+   });
 }
-
 String.prototype.toSentenceCase = function() {
 	return this.charAt(0).toUpperCase() + this.substr(1).toLowerCase();
 }
-
 String.prototype.toContent = function() {
 	return this.replace(/-/g, " ");
 }
+String.prototype.toPath = function() {
+	return this.trim().replace(/ /g, "_").replace(/-/g, "_").replace(/[\/\W]/g, "").replace(/_/g, "-");
+}
+
+const font = {
+	size: 0
+}
 
 const copyColourFallback = (copyInfo, attr) => {
 	console.log("fallback")
@@ -50,13 +59,16 @@ const copyColourFallback = (copyInfo, attr) => {
 const showMessage = (m, s) => {
 	s = s == undefined ? true : s;
 	console.log("Copy success (navigator.clipboard)");
-	$("body").prepend("<div id='copystatus' style='display: none;'><div class='"+(s ? "succeeded" : "failed")+"'>" + m + "</div></div>");
+	let status = document.createElement("div");
-	$("#copystatus > div").css("top", (window.scrollY + 100)+ "px");
+	status.setAttribute("id", "copystatus");
-	$("#copystatus").fadeIn(1000, function(){
+	// status.style.display = "none";
-		$(this).fadeOut( 1000, function() {
+	status.innerHTML = "<div class='"+(s ? "succeeded" : "failed")+"'>" + m + "</div>";
-			$(this).remove();
+	document.querySelector("body").prepend(status)
-		});
+
-	})
+	status.querySelector("div").style.top = (window.scrollY + 100)+ "px";
+	setTimeout( () => {
+		status.remove();
+	}, 1000); 
 }
 
 const oneClickSelect = (e, t = e.currentTarget) => {
@@ -126,9 +138,7 @@ module.exports = {
 		},
 	},
 	colour: {
-		// showMessage: (m, s) => {
+
-		// 	showMessage(m, s);
-		// },
 		copy:  (w, t) => {
 			let c = t.parentNode.getAttribute("data-" + (w=="var" ? "token" : w));
 			c = w == "var" ? `var(${c})` : c;
@@ -143,109 +153,142 @@ module.exports = {
 				copyColourFallback(c, w);
 			}
 		},
+
 		positionTooltip: () => {
-			$("color-pill > span").each(function(){
+			document.querySelectorAll("color-pill > span").forEach((ps) =>  {
-				if ((Number($("p").css('font-size').replace("px","")) * 10)  > $(this).offset().left) {
+				ps.querySelectorAll("div.tooltip-tc").forEach((tip) => {
-					$(this).children("div.tooltip-tc").attr("tip-position", "right");
+					if ( (font.size * 10) > ps.offsetLeft ) {
-				} else {
+						tip.setAttribute("tip-position", "right");
-					$(this).children("div.tooltip-tc").attr("tip-position", "bottom");
+					} else {
-				}
+						tip.setAttribute("tip-position", "bottom");
+					}
+				});
 			})
 		}
 	},
 	init: (args = {}) => {
 		const 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((a) => {
 				a.remove();
 			});
 
 			if (url.p == -1) {
-				document.querySelector("title").innerHTML = `${url.p.toContent().toTitleCase()} | ${$("title").attr("data-site")}`;
+				document.querySelector("title").innerHTML = `${url.p.toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`;
 			} else {
-				document.querySelector("title").innerHTML = `${url.p.substring(url.p.lastIndexOf("/")+1).toContent().toTitleCase()} | ${$("title").attr("data-site")}`
+				document.querySelector("title").innerHTML = `${url.p.substring(url.p.lastIndexOf("/")+1).toContent().toTitleCase()} | ${ document.querySelector("title").getAttribute("data-site") }`
 			}
-			document.querySelector("nav ul li a[href='./?p=" + (url.p.indexOf("/") == -1 ? url.p : url.p.substring(0, url.p.indexOf("/")) ) + "']").parentNode.classList.add("active");
-		} else {
-			document.querySelector("nav ul li a[href='./']").parentNode.classList.add("active");
 		}
 
+		if (typeof args.beforeArticleLoad == "function") args.beforeArticleLoad();
+
 		document.querySelectorAll("article").forEach((a) => {
 			if ( a.getAttribute("data-template") != "none" ) {
-				let path = "patterns/" + (a.getAttribute("data-core") == "true" ? "core/" : "") + a.getAttribute("data-path") + "/index.html";
+				const observer = new IntersectionObserver(articles => {
-				const ASYNC = true;
+					articles.forEach(article => {
-				let ajx = new XMLHttpRequest();
+						let a = article.target;
-				ajx.onreadystatechange = () => {
-					if (ajx.readyState == 4) {
 
-						switch (ajx.status) {
+						// console.log("observing: ", { id: a.getAttribute("id"), intersecting: a.isIntersecting } )
-							case 200: 
+						// if (article.intersectionRatio > 0) {
-								a.innerHTML = a.innerHTML + ajx.responseText;
+							// console.log("Is interesecting: ", { id: article.target.getAttribute("id"), intersecting: article.isIntersecting, ratio: article.intersectionRatio } )
 
-								switch (a.getAttribute("data-template")) {
+						if (article.isIntersecting == true) {
-								 	case "pug": 
+							let path = a.getAttribute("data-path");
-								 		a.querySelectorAll("pre").forEach((aa) => {
+							path = "patterns/" + 
-								 			aa.innerHTML = `<code class="${aa.getAttribute("class")}">${aa.innerHTML}</code>`;
+							 		(a.getAttribute("data-core") == "true" ? 
-								 		})
+							 		"core/" + path.substring(path.lastIndexOf("/") + 1) : 
-								 	break;
+							 		a.getAttribute("data-path")) 
-								 	case "md": 
+							 		+ "/index.html";
-								 		a.querySelectorAll("code").forEach((aa) => {
+							const ASYNC = true;
-								 			aa.classList.add("language-html");
+							let ajx = new XMLHttpRequest();
-								 		})
+							ajx.onreadystatechange = () => {
-								 	break;
+								if (ajx.readyState == 4) {
-								}
+									observer.unobserve(article.target);								
-								a.querySelectorAll("code").forEach((c)=> {
+									switch (ajx.status) {
-									c.classList.add("line-numbers");
+										case 200: 
-									c.innerHTML = c.innerHTML.replace(/</g, "&lt;");
+											a.innerHTML = a.innerHTML + ajx.responseText;
-									c.classList.add("copy-to-clipboard-button");
+											a.style.height = "auto"
-								})
+											switch (a.getAttribute("data-template")) {
-								if (typeof args.success == "function") args.success(a);
+											 	case "pug": 
+											 		a.querySelectorAll("pre").forEach((aa) => {
+											 			aa.innerHTML = `<code class="${aa.getAttribute("class")}">${aa.innerHTML}</code>`;
+											 		})
+											 	break;
+											 	case "md": 
+											 		a.querySelectorAll("code").forEach((aa) => {
+											 			aa.classList.add("language-html");
+											 		})
+											 	break;
+											}
 
-								Prism.highlightAll();
+											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);
 
-								a.querySelectorAll("code").forEach((c)=> {
+											Prism.highlightAll();
-									c.onclick = (e) => {
+
-										oneClickSelect(e);
+											a.querySelectorAll("code").forEach((c)=> {
+												c.onclick = (e) => {
+													oneClickSelect(e);
+												}
+											})
+
+
+											module.exports.colour.positionTooltip();
+											window.onresize = () => {
+												module.exports.colour.positionTooltip();
+											}
+
+											a.querySelectorAll("name > span, color-pill > span").forEach((pill) => {
+												pill.onclick = (e) => {
+													e.preventDefault();
+													let w = "";
+													if (e.metaKey || e.ctrlKey || e.keyCode == 91 || e.keyCode == 224) {
+														w = "var";
+													} else if (e.altKey) {
+														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", { status: ajx.status, path: a.getAttribute("data-path") });
 									}
-								})
 
+									a.style.height = "auto";
+									
+									if (typeof args.done == "function") args.done(a);
 
-								module.exports.colour.positionTooltip();
-								window.onresize = () => {
-									module.exports.colour.positionTooltip();
 								}
+							};
+							ajx.open("GET", path, ASYNC);
+							ajx.send();
 
-								a.querySelectorAll("name > span, color-pill > span").forEach((pill) => {
-									pill.onclick = (e) => {
-										e.preventDefault();
-										let w = "";
-										if (e.metaKey || e.ctrlKey || e.keyCode == 91 || e.keyCode == 224) {
-											w = "var";
-										} else if (e.altKey) {
-											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", { status: ajx.status, path: a.getAttribute("data-path") });
 						}
-					}
+					})
-				};
+				}, { threshold: 0, rootMargin: "100%" })
-				ajx.open("GET", path, ASYNC);
+
-				ajx.send();
+				observer.observe(a);
+
+			} else {
+				a.style.height = "auto";
 			}
 		})
+
+		if (typeof args.afterArticleLoad == "function") args.afterArticleLoad();
 	}
 };

src/js/scaffolding.js

@@ -1,16 +1,16 @@
 // core and prism
 import * as core from './core/_core.js';
 import * as Prism from "../../node_modules/prismjs/prism";
+import "../../node_modules/prismjs/plugins/line-numbers/prism-line-numbers";
+import "../../node_modules/prismjs/plugins/toolbar/prism-toolbar";
 import '../../node_modules/prismjs/components/prism-json';
 import '../../node_modules/prismjs/components/prism-pug';
 import '../../node_modules/prismjs/components/prism-sass';
-import "../../node_modules/prismjs/plugins/toolbar/prism-toolbar";
-import "../../node_modules/prismjs/plugins/line-numbers/prism-line-numbers";
 
 // import pattern stuff.
-import * as swtch from "../pg/patterns/core/components/switch/_switch.js";
+import * as stickynote from "../pg/patterns/core/sticky-note/_sticky-note.js";
-import * as stickynote from "../pg/patterns/core/components/sticky-note/_sticky-note.js";
+import * as swtch      from "../pg/patterns/core/switch/_switch.js";
-import * as tabs from "../pg/patterns/core/layouts/tabs/_tabs.js";
+import * as tabs       from "../pg/patterns/core/tabs/_tabs.js";
 
 // init core
 core.init({
@@ -24,30 +24,56 @@ core.init({
 	}
 });
 
-jQuery(document).ready(function($){
+
-	// show deprecated switch
+
-	function flipDeprecated() {
+
-		setTimeout(function(){
+// deprecated switch handler
-			if ($("#deprecated").attr("aria-checked") == "false") {
+const flipInfoSwitch = (e, s = e.currentTarget) => {
-				$(".status-deprecated").closest("article").addClass("status-deprecated");
+	
-				core.cookie.set("show-deprecated", false, 30, "/");
+	switch(s.getAttribute("id")) {
-			} else {
+
-				$("article.status-deprecated").removeClass("status-deprecated");
+		case "deprecated" : 
-				core.cookie.set("show-deprecated", true, 30, "/");
+			core.cookie.set("show-deprecated", s.getAttribute("aria-checked"), 30, "/");
-			}
+			document.querySelector("main").querySelectorAll("article[data-status=deprecated]").forEach((a) => {
-		}, 50);
+				a.classList[( s.getAttribute("aria-checked") == "true" ? "add" : "remove" )]("show-deprecated");
+			});
+		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; 
 	}
 
-	$("#deprecated").on("click", flipDeprecated).on("keypress", flipDeprecated);
+}
-	setTimeout( function() {
-		if (core.cookie.get("show-deprecated") == "true") {
-			$("#deprecated").attr("aria-checked", "true");
-			flipDeprecated();
-		}
-	}, 200);
-	console.log("hide deprecated", { "type": (typeof core.cookie.get("show-deprecated")), "value": core.cookie.get("show-deprecated") });
-	// /hide deprecated switch
 
-})
+// create a pure JS mouse click event
+const click = new MouseEvent('click', {
+	view: window,
+	bubbles: false,
+	cancelable: true
+});
 
-	// import("../pg/patterns/layouts/main-navigation/_main-navigation.js");
+// get the switch, initialize it and add the handler
+let switches = document.querySelector(".info-switches");
+swtch.init(switches);
+
+let deprecated = document.querySelector("#deprecated");
+let breakpoints = document.querySelector("#breakpoints");
+
+deprecated.onclick = flipInfoSwitch;
+deprecated.keypress = flipInfoSwitch;
+breakpoints.onclick = flipInfoSwitch;
+breakpoints.keypress = flipInfoSwitch;
+
+// check a cookie to get the switch's state
+if (core.cookie.get("show-deprecated") == "true") {
+	deprecated.dispatchEvent(click);
+}
+if (core.cookie.get("show-breakpoints") == "true") {
+	breakpoints.dispatchEvent(click);
+}
+
+// just for fun... We'll show deprecated if they match the path
+// document.querySelector(`#${core.url.p.replace(/\//g, "-")}`).classList.add("show-deprecated");

src/pg/_config.pug

@@ -7,7 +7,7 @@
 - 
 	var content = [ 
 		{
-			name: "this-pattern-doesn't-exist",
+			name: "this pattern doesn't exist",
 			status: "deprecated",
 		},
 		{	
@@ -22,17 +22,17 @@
 			files: [
 				{
 					name: "sticky-note",
-					status: "in-progress",
+					status: "complete",
 					core: true,
 				},
 				{
 					name: "switch",
-					status: "in-progress",
+					status: "complete",
 					core: true,
 				},
 				{
 					name: "tooltip",
-					status: "in-progress",
+					status: "complete",
 					core: true,
 				},
 			]
@@ -45,12 +45,12 @@
 			files: [
 				{
 					name: "header",
-					status: "in-progress",
+					status: "complete",
 					core: true,
 				}, 
 				{
 					name: "breakpoints",
-					status: "in-progress",
+					status: "complete",
 					core: true,
 				},
 				{

src/pg/core/_master-index.pug

@@ -1,7 +1,8 @@
-include ../_config
+//-		
-block config
+	DS2 core (c) 2024 Alexander McIlwraith 
+	Core licensed under CC BY-SA 4.0 
 
-- var getDate = function(){
+- const getDate = function(){
 -	var d = new Date();
 -	return d.toLocaleDateString(lang, {day: "numeric", month: "long", year: "numeric"});
 - }
@@ -16,23 +17,28 @@ block config
 - String.prototype.toContent = function() {
 -	return this.replace(/-/g, " ");
 - }
+- String.prototype.toPath = function() {
+-	return this.trim().replace(/ /g, "_").replace(/-/g, "_").replace(/[\/\W]/g, "").replace(/_/g, "-");
+- }
+
+include ../_config
+block config
+
 
 mixin show-content(items, path)
-	- path = (path == "" ? "" : path + "/") + items.name
-	- if (items.status == "deprecated") {
-		- articlestatus = "status-deprecated"
-	- } else {
-		- articlestatus = ""
-	- }
 
-	article(id=path.replace(/\//g, "-")
+	- path = (path == "" ? "" : path +  "/") + items.name.toPath()
-		class=articlestatus 
+
-		data-path=path
+	article(id=path.replace(/\//g, "-").toPath()
-		data-template=(items.template == undefined ? "pug" : items.template) 
+		data-name=items.name
-		data-pattern=items.name
 		data-status=items.status
+		data-display=items.display
+		data-template=(items.template == undefined ? "pug" : items.template) 
 		data-core= (items.core ? "true" : "false")
+		data-path=path
+		style="height: 100vh"
 		)
+
 		h1(class="status-" + items.status )
 			span= items.name.toSentenceCase().toContent()
 				tool-tip(role="tooltip" inert tip-position="right")= items.status.toSentenceCase().toContent()
@@ -52,9 +58,13 @@ html(lang= lang )
 
 		block head
 		link( href="assets/scaffolding.css" rel="stylesheet" )
-		script(src="assets/jquery-min.js")
 
 	body
+		//		
+			DS2 core (c) 2024 Alexander McIlwraith 
+			Core licensed under CC BY-SA 4.0 
+
+
 		a.skip(href="#main") Skip to main content
 		div.container
 

src/pg/core/_master-pattern.pug

@@ -1,3 +1,7 @@
+//-		
+	DS2 core (c) 2024 Alexander McIlwraith 
+	Core licensed under CC BY-SA 4.0 
+
 include ../_config
 block config
 
@@ -5,7 +9,7 @@ mixin h(h)
 	if headings[h]
 		h2= headings[h]
 
-- var getDate = function(){
+- const getDate = function(){
 -	var d = new Date();
 -	return d.toLocaleDateString(lang, {day: "numeric", month: "long", year: "numeric"});
 - }
@@ -20,6 +24,9 @@ mixin h(h)
 - String.prototype.toContent = function() {
 -	return this.replace(/-/g, " ");
 - }
+- String.prototype.toPath = function() {
+-	return this.trim().replace(/ /g, "_").replace(/-/g, "_").replace(/[\/\W]/g, "").replace(/_/g, "-");
+- }
 
 
 html 

src/pg/index.pug

@@ -8,17 +8,18 @@ block head
 	link(rel="icon" href="https://assets.gamv.ca/favicon-dark.svg" media="(prefers-color-scheme:dark)")
 
 block header
-	include patterns/core/layouts/header/_header.pug
+	include patterns/core/header/_header.pug
 	
 	nav
 		ul
-			li 
-				a(href="./") Home
 			each first in content
 				li(class= navClass)
-					a(href="./?p=" + first.name )= first.name.toContent().toSentenceCase()
+					a(href="./?p=" + first.name.toPath() )= first.name.toContent().toSentenceCase()
 
-	p.deprecated-switch
+	p.info-switches
 		span
 		span#deprecated(role="switch")
 		label(for="deprecated") Show deprecated patterns
+		span
+		span#breakpoints(role="switch")
+		label(for="breakpoints") Show breakpoint information

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

@@ -1,7 +1,8 @@
 //-		DS2 core (c) 2024 Alexander McIlwraith 
 //-		Licensed under CC BY-SA 4.0 
 
-$grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px ) !default;
+// default breakpoints match bootstrap 5 breakpoints.
+$grid-breakpoints: ( xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1400px ) !default;
 
 @mixin breakpoint-debug {
 	body::before, body::after {

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

@@ -0,0 +1,22 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
+extends ../../../core/_master-pattern
+block content
+	
+	+h(0)
+	p Breakpoints enable responsive mobile design.
+
+	+h(1)
+	p Use breakpoints when designing for different screen sizes. 
+
+	p The breakpoints SCSS mixin included implements media queries to allow for the change of the layout and design based on pre-defined screen sizes. 
+
+	+h(2)
+	p This pattern is only available for SCSS breakpoints. The  mixin is avai
+
+	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. 
+
+	div.tab-group#breakpoints
+		pre.language-css(data-tab="scss")
+			include _breakpoints.scss

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

@@ -1,7 +1,20 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
 extends ../../../core/_master-pattern
-
-
 block content
+
+	+h(0)
+	p Colours are used to represent your site and are an implementation of your brand's visual identity. 
+
+	+h(1)
+	p Colours are used throughout your patterns. 
+
+	+h(2)
+	p Hover over the colour gradient sample pills to view the accessibility information for each colour sample against black and white. 
+
+	p Click on the colour name or the colour gradient sample pills to copy the colour to your clipboard. A regular click will copy the hex code, a shift+click will copy the RGB code, the alt key (or Mac option ⌥ key) will copy the colour token, and the meta key (Windows key or Mac command ⌘ key) will copy a CSS colour var. 
+
 	include ../../../core/_colour-samples
-	h2 Primary colours
+	h3 Primary colours
 	+colour-samples(colours, "colors")

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

@@ -1,24 +0,0 @@
-extends ../../../../core/_master-pattern.pug
-block content
-	+h(0)
-	+h(1)
-	+h(2)
-	p Uses absolute positioning. 
-		sticky-note(float="right").blue This #[strong is] a test
-		| You might need to add relative positioning to it's container. 
-
-	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 another one
-
-	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". 
-
-
-
-	div#sticky-note.tab-group
-		pre.language-css(data-tab="css") 
-			include sticky-note.css
-		pre.language-css(data-tab="scss") 
-			include _sticky-note.scss
-		pre.language-js(data-tab="js") 
-			include _sticky-note.js

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

@@ -1,28 +0,0 @@
-//-		DS2 core (c) 2024 Alexander McIlwraith 
-//-		Licensed under CC BY-SA 4.0 
-
-function flip(e) {
-	let sw = e.currentTarget;
-	switch(sw.getAttribute("aria-checked")) {
-		case "true": 
-			sw.setAttribute("aria-checked", "false");
-		break;
-		case "false": 
-			sw.setAttribute("aria-checked", "true");
-		break;
-	}
-};
-
-
-function init(callback){
-	let sw = document.querySelectorAll("[role='switch']");
-	for (let i=0; i < sw.length; i++) {
-		sw[i].innerHTML = "<span></span>";
-		sw[i].setAttribute("aria-checked", "false");
-		sw[i].setAttribute("tabindex", "0");
-		sw[i].addEventListener("click", flip, false);
-		sw[i].addEventListener("keypress", flip, false);
-	}
-}
-
-export {init};

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

@@ -1,25 +0,0 @@
-extends ../../../../core/_master-pattern.pug
-
-
-block content
-
-	+h(0)
-	+h(1)
-	+h(2)
-
-	h2 Example
-	p.switch
-		label(for="example-switch") Switch label
-		span#example-switch(role="switch")
-
-	div#switches.tab-group
-		pre.language-html(data-tab="html")
-			include _switch.pug
-		pre.language-pug(data-tab="pug")
-			include switch.pug
-		pre.language-css(data-tab="css")
-			include switch.css
-		pre.language-css(data-tab="scss")
-			include _switch.scss
-		pre.language-js(data-tab="js")
-			include _switch.js

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

@@ -1,2 +0,0 @@
-.
-	span#example-id(role="switch")

src/pg/patterns/core/components/tooltip/_tooltip.pug

@@ -1,5 +0,0 @@
-a(href="#") Link with a tool tip
-	div(role="tooltip" inert tip-position="bottom") Tool tip content
-
-a(href="#") Link with a tool tip
-	tool-tip(role="tooltip" inert tip-position="bottom") Tool tip content

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

@@ -1,32 +0,0 @@
-extends ../../../core/_master-pattern.pug
-
-
-block content
-
-	+h(0)
-	+h(1)
-	+h(2)
-
-	p Either form works. Place this inside another element for the tooltip to be "linked to that element."
-
-	
-
-
-	p Tool tip positions are: 
-	ul 
-		li top / block-start
-		li right / inline-end
-		li bottom / block-end
-		li left / inline-start
-
-
-	div#tooltip.tab-group
-		pre.language-html(data-tab="html")
-			include _tooltip.pug
-		pre.language-pug(data-tab="pug")
-			include tooltip.pug
-		pre.language-css(data-tab="css")
-			include tooltip.css
-		pre.language-css(data-tab="scss")
-			include _tooltip.scss
-

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

@@ -1,6 +0,0 @@
-.
-	a(href="#") Link with a tool tip
-		div(role="tooltip" inert tip-position="bottom") Tool tip content
-
-	a(href="#") Link with a tool tip
-		tool-tip(role="tooltip" inert tip-position="bottom") Tool tip content

src/pg/patterns/core/header/_header.pp

@@ -0,0 +1,16 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Licensed under CC BY-SA 4.0 
+
+//- required variables
+//- site - the site name that goes in the site title
+//- root - the path to the root of the site
+
+header
+	// The headline banner area 
+	svg(height='5.5rem' width='100%' xmlns='http://www.w3.org/2000/svg' aria-hidden='true')
+		text= site
+	div
+		div.header-title
+			h1 
+				a(href="./")= site
+		// Other sections can go here, such as search and directory

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

@@ -12,5 +12,5 @@ header
 	div
 		div.header-title
 			h1 
-				a(href= root )= site
+				a(href="./")= site
 		// Other sections can go here, such as search and directory

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

@@ -0,0 +1,37 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
+extends ../../../core/_master-pattern
+block content
+
+	+h(0)
+	p A header is layout pattern that helps the user identify the site.  
+	+h(1)
+	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. This basic header should be replaced with your own site's header. 
+
+
+	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
+			- site = "[site name]"
+			- root = "[site root]"
+			
+			include _header.pug
+			
+			//- reset variables to original values
+			- site= tmpsite 
+			- root= tmproot 
+
+		pre.language-html(data-tab="html")
+			include _header.pug
+		pre.language-pug(data-tab="pug")
+			include _header.pp
+		pre.language-css(data-tab="css")
+			include header.css
+		pre.language-sass(data-tab="scss")
+			include _header.scss

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

@@ -1,13 +0,0 @@
-extends ../../../../core/_master-pattern.pug
-
-block content
-	
-	+h(0)
-	+h(1)
-	+h(2)
-
-	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. 
-
-	div.tab-group#breakpoints
-		pre.language-css(data-tab="scss")
-			include _breakpoints.scss

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

@@ -1,23 +0,0 @@
-extends ../../../../core/_master-pattern.pug
-	
-	
-block content
-
-	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
-			- site = "[site name]"
-			- root = "[site root]"
-			
-			include _header.pug
-			
-			//- reset variables to original values
-			- site= tmpsite 
-			- root= tmproot 
-
-		pre.language-sass(data-tab="scss")
-			include _header.scss
-		pre.language-css(data-tab="css")
-			include header.css

src/pg/patterns/core/layouts/tabs/_tabs.pug

@@ -1,4 +0,0 @@
-div#uniqueID.tab-group
-	div(data-tab="[tab title]")
-	div(data-tab="[tab title]")
-		

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

@@ -1,26 +1,28 @@
-extends ../../../core/_master-pattern.pug
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
 
+extends ../../../core/_master-pattern
 block content
 	- 
 	- let list = []
 	- for(let i = 0; i < content.length; i++) {
-	-	list.push({ "name": content[i].name, "path": content[i].name, "status": content[i].status, "display": content[i].display } )
+	-	list.push({ "name": content[i].name, "path": content[i].name, "status": content[i].status, "display": (content[i].hasOwnProperty("display") && content[i].display != "" ? content[i].display : content[i].name.toSentenceCase().toContent())  } )
 	-	if (content[i].files != undefined) {
 	-		for (let ii = 0; ii < content[i].files.length; ii++) {
-	-			list.push({ "name": content[i].files[ii].name, "path": content[i].name +"."+ content[i].files[ii].name, "status": content[i].files[ii].status } )
+	-			list.push({ "name": content[i].files[ii].name, "path": content[i].name +"."+ content[i].files[ii].name, "status": content[i].files[ii].status, "display": (content[i].files[ii].hasOwnProperty("display") && content[i].files[ii].display != "" ? content[i].files[ii].display : content[i].files[ii].name.toSentenceCase().toContent()) } )
 	-			if (content[i].files[ii].files != undefined) {
 	-				for (let iii = 0; iii < content[i].files[ii].files.length; iii++) {
-	-					list.push({ "name": content[i].files[ii].files[iii].name, "path": content[i].name +"."+ content[i].files[ii].name + "." + content[i].files[ii].files[iii].name, "status": content[i].files[ii].files[iii].status } )
+	-					list.push({ "name": content[i].files[ii].files[iii].name, "path": content[i].name +"."+ content[i].files[ii].name + "." + content[i].files[ii].files[iii].name, "status": content[i].files[ii].files[iii].status, "display": (content[i].files[ii].files[iii].hasOwnProperty("display") && content[i].files[ii].files[iii].display != "" ? content[i].files[ii].files[iii].display : content[i].files[ii].files[iii].name.toSentenceCase().toContent()) } )
 	-				}
 	-			}
 	-		}
 	- 	}
 	- }
 	- list.sort((a, b) => {
-	-	if (a.name < b.name) {
+	-	if (a.display < b.display) {
 	-		return -1;
 	-	}
-	-	if (a.name > b.name) {
+	-	if (a.display > b.display) {
 	-		return 1;
 	-	}
 	-	return 0;

src/pg/patterns/core/sticky-note/_sticky-note.pp

@@ -0,0 +1,2 @@
+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.

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

@@ -0,0 +1,2 @@
+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.

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

@@ -0,0 +1,29 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
+extends ../../../core/_master-pattern
+block content
+	+h(0)
+	p Sticky notes provide a way to attach information. They are a DS2 core pattern for making notes. 
+	+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. 
+		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.
+
+	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")
+			include _sticky-note.pug
+		pre.language-pug(tab="pug")
+			include _sticky-note.pp
+		pre.language-css(data-tab="css") 
+			include sticky-note.css
+		pre.language-css(data-tab="scss") 
+			include _sticky-note.scss
+		pre.language-js(data-tab="js") 
+			include _sticky-note.js

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

@@ -0,0 +1,26 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Licensed under CC BY-SA 4.0 
+
+function flip(e) {
+	let sw = e.currentTarget;
+	switch(sw.getAttribute("aria-checked")) {
+		case "true": 
+			sw.setAttribute("aria-checked", "false");
+		break;
+		case "false": 
+			sw.setAttribute("aria-checked", "true");
+		break;
+	}
+};
+
+module.exports = {
+	init: (p = document) => {
+		p.querySelectorAll("[role='switch']").forEach((sw) => {
+			sw.innerHTML = "<span></span>";
+			sw.setAttribute("aria-checked", "false");
+			sw.setAttribute("tabindex", "0");
+			sw.addEventListener("click", flip, false);
+			sw.addEventListener("keypress", flip, false);
+		})
+	}
+}

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

@@ -0,0 +1 @@
+span#example-id(role="switch")

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

@@ -3,9 +3,9 @@
 
 @use "sass:math";
 
-$switch-accent: var(--colour-blue) !default;     // switch background when switched right (on/ true)
+$switch-accent: #2e51a1 !default;     // switch background when switched right (on/ true)
-$switch-background: var(--colour-grey-xl) !default;   // switch background when switched left (off / false)
+$switch-background: #d8d8d8 !default;   // switch background when switched left (off / false)
-$switch-color: var(--colour-white) !default;    // the colour of the switch
+$switch-color: white !default;    // the colour of the switch
 $switch-height: 1.5rem !default;
 
 @mixin switch {  

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

@@ -0,0 +1,33 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
+extends ../../../core/_master-pattern
+block content
+
+	+h(0)
+	p Switches are used to toggle application state between two mutually exclusive values. 
+
+	+h(1)
+	p Use a switch when the user will see an immediate visible state change. Do not use a switch when the state change will affect future results. The user should not have to perform another action (search, save, etc) for the result to take affect. If the change in state does not take effect immediately, consider a checkbox. 
+
+	+h(2)
+	p The switch label should describe what will happen when the switch is turned to the on state. Frontload labels with keywords. 
+
+	p Include the CSS and JavaScript. An additional handler will need to be created for the actual state change. The CSS implements the visual design of the switch, which is based on the accessibility properties, which are implemented by the JavaScript.
+
+	h2 Example
+	p.switch
+		label(for="example-switch") Switch label (states the on state)
+		span#example-switch(role="switch")
+
+	div#switches.tab-group
+		pre.language-html(data-tab="html")
+			include _switch.pug
+		pre.language-pug(data-tab="pug")
+			include _switch.pp
+		pre.language-css(data-tab="css")
+			include switch.css
+		pre.language-css(data-tab="scss")
+			include _switch.scss
+		pre.language-js(data-tab="js")
+			include _switch.js

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

@@ -0,0 +1,4 @@
+tabset#uniqueID
+	div(tab="[tab title]")
+	div(tab="[tab title]")
+		

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

@@ -0,0 +1,4 @@
+tabset#uniqueID
+	div(tab="[tab title]")
+	div(tab="[tab title]")
+		

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

@@ -1,9 +1,9 @@
 //		DS2 core (c) 2024 Alexander McIlwraith 
 //		Licensed under CC BY-SA 4.0 
 
-$tab-border: var(--colour-grey) !default; 
+$tab-border: #7f7f7f !default; 
-$tab-selected: var(--colour-white) !default;
+$tab-selected: #FFF !default;
-$tab-notselected: var(--colour-grey-xxl) !default;
+$tab-notselected: #f0f0f0 !default;
 
 @mixin tabs {
 	tabset, .tab-group {

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

@@ -1,15 +1,13 @@
 //-		DS2 core (c) 2024 Alexander McIlwraith 
-//-		Licensed under CC BY-SA 4.0 
+//-		Core licensed under CC BY-SA 4.0 
-
-extends ../../../../core/_master-pattern.pug
-
 
+extends ../../../core/_master-pattern
 block content
 
 	+h(0)
-	+h(1)
+	p A tabs component that provides different sections of content that are displayed one at a time when the user selects that information. 
-	+h(2)
 
+	+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 
@@ -21,24 +19,18 @@ 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(1)
 	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).
 
-
-
-
 	tabset#tabs
 		pre.language-html(tab="html")
 			include _tabs.pug
-
+		pre.language-pug(tab="pug")
-		//- pre.language-pug(tab="pug").
+			include _tabs.pp
-			include _tabs.pug
-
 		pre.language-css(tab="css")
 			include tabs.css
-		
 		pre.language-css(tab="scss")
 			include _tabs.scss
-
 		pre.language-css(tab="js")
 			include _tabs.js
 

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

@@ -0,0 +1,2 @@
+a(href="#") Link with a tool tip
+	span(role="tooltip" inert tip-position="right") Tool tip content

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

@@ -0,0 +1,2 @@
+a(href="#") Link with a tool tip
+	span(role="tooltip" inert tip-position="right") Tool tip content

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

@@ -0,0 +1,40 @@
+//-		DS2 core (c) 2024 Alexander McIlwraith 
+//-		Core licensed under CC BY-SA 4.0 
+
+extends ../../../core/_master-pattern
+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. 
+	
+	p Use tooltips to help differentiate between multiple, close, similar options. 
+
+	+h(2)
+
+	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 Tool tip positions are: 
+	ul 
+		li top / block-start
+		li right / inline-end
+		li bottom / block-end
+		li left / inline-start
+
+	p
+		include _tooltip.pug
+
+
+	div#tooltip.tab-group
+		pre.language-html(data-tab="html")
+			include _tooltip.pug
+		pre.language-pug(data-tab="pug")
+			include _tooltip.pp
+		pre.language-css(data-tab="css")
+			include tooltip.css
+		pre.language-css(data-tab="scss")
+			include _tooltip.scss
+

src/scss/scaffolding.scss

@@ -12,21 +12,18 @@ $tooltip-dark-allow: false;
 
 @use 'sass:math';
 
-
 // We recommend explicitly using the underscore when referring to pattern scss 
 // as you may have also created a version that compiles to css to display in 
 // your pattern. 
 @import "core";
 
-@import "../pg/patterns/components/sticky-note-core/_sticky-note";
+@import "../pg/patterns/core/sticky-note/_sticky-note";
-@import "../pg/patterns/components/tooltip-core/_tooltip";
+@import "../pg/patterns/core/switch/_switch";
-@import "../pg/patterns/components/switch-core/_switch";
+@import "../pg/patterns/core/tooltip/_tooltip";
-
+@import "../pg/patterns/core/breakpoints/_breakpoints";
-@import "../pg/patterns/layouts/breakpoints-core/_breakpoints";
+@import "../pg/patterns/core/header/_header";
-@import "../pg/patterns/layouts/header-core/_header";
+@import "../pg/patterns/core/tabs/_tabs"; 
-@import "../pg/patterns/layouts/tabs-core/_tabs"; 
+@import "../pg/patterns/core/status/_status";
-
-@import "../pg/patterns/status-core/_status";
 
 * {
 	box-sizing: border-box;
@@ -38,6 +35,9 @@ html {
 	@include break(-md) {
 		font-size: calc($font-size + 2pt);
 	}
+	&.show-breakpoints {
+		@include breakpoint-debug;
+	}
 }
 
 @include core-colour-samples;
@@ -46,6 +46,10 @@ html {
 @include sticky-note;
 @include status;
 
+article[data-status=deprecated]:not(.show-deprecated) {
+	display: none;
+}
+
 body {
 	margin: 0;
 	padding: 0;
@@ -86,18 +90,24 @@ body {
 		}
 
 
-		p.deprecated-switch {
+		p.info-switches {
+			align-items: center;
+			display: grid;
+			gap: .25rem;
 			grid-column: 2 / 4;
 			grid-row: 3;
+			grid-template-columns: auto repeat(2, max-content);
 			text-align: right;
 			@include switch;
+			label {
+				text-align: left;;
+			}
 
 		}
 		main {
 			display: block;
 			grid-column: 1 / -1;
 			grid-row: 4;
-			padding: 0 1rem;
 
 			@include break(-md) {
 				grid-row: 3;