Merge pull request #70 from st3phhays/gulp-bootstrap

(#58)(#68)(#69) choco-theme 0.6.0

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 ARG VARIANT="6.0-focal"
 FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
 
-ARG NODE_VERSION="16"
+ARG NODE_VERSION="20"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			"VARIANT": "6.0-focal",
-			"NODE_VERSION": "16"
+			"NODE_VERSION": "20"
 		}
 	},
 	"settings": {},

.yarnrc.yml

@@ -2,4 +2,4 @@ checksumBehavior: update
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.2.cjs
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

input/404.md

@@ -7,7 +7,7 @@ ShowInSidebar: false
 <main id="centeredLayout" class="position-relative d-sm-flex bg-img-cover bg-architect-factory">
     <div class="container py-3 py-md-5 d-flex flex-column justify-content-center">
         <div class="col-md-8 col-xl-6 mx-auto">
-            <div class="card card-body text-bg-theme-background p-md-5">
+            <div class="card card-body text-bg-body p-md-5">
                 <div class="w-75 mx-auto">
                     <svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 206.64893 77.56641"><defs>
                     <style>.b{fill:var(--bs-primary);}</style></defs><path class="b" d="M35.47705,76.04785v-17.68164H2.62354v-11.29346L30.57227,1.89941h21.33154V45.36182h8.78369v13.00439h-8.78369v17.68164h-16.42676Zm0-30.686V28.93506c0-4.44922,.22852-9.01172,.45654-13.80322h-.34228c-2.39551,4.7915-4.44873,9.126-6.9585,13.80322l-9.81054,16.19873-.11426,.228,16.76904,.00006Z"/><path class="b" d="M131.3479,44.24769l6.33064,3.6542c.71182,.40453,1.05098,1.24625,.8185,2.03128-1.62909,5.25565-4.4174,10.07848-8.15921,14.11266-.56355,.59412-1.46233,.72126-2.16856,.30678l-6.3259-3.65362c-2.65957,2.27877-5.7172,4.04664-9.019,5.21465v7.306c.006,.81955-.5545,1.53476-1.35173,1.72482-5.36482,1.2077-10.93102,1.2078-16.29589,.00031-.79717-.19025-1.35777-.90522-1.35236-1.72477v-7.30636c-3.30183-1.16794-6.35947-2.93582-9.019-5.21465l-6.3259,3.65362c-.70625,.41449-1.60503,.28733-2.16859-.30681-3.74174-4.03423-6.53004-8.85704-8.15919-14.11266-.23248-.78503,.10669-1.62674,.81851-2.03125l6.3308-3.6542c-.63539-3.44436-.63539-6.97589,0-10.42025l-6.33065-3.6542c-.71182-.40453-1.05099-1.24624-.81851-2.03128,1.6291-5.25565,4.41741-10.07848,8.15922-14.11267,.56355-.59412,1.46232-.72126,2.16856-.30677l6.3259,3.65362c2.65957-2.27877,5.7172-4.04665,9.019-5.21466V4.85529c-.006-.81955,.5545-1.53476,1.35173-1.72482,5.36482-1.20769,10.93102-1.2078,16.29588-.00031,.79721,.19025,1.35783,.90526,1.35239,1.72484v7.30634c3.30183,1.16793,6.35947,2.93582,9.019,5.21465l6.3259-3.65362c.70625-.41449,1.60504-.28734,2.16859,.3068,3.74174,4.03423,6.53004,8.85704,8.15919,14.11266,.23248,.78503-.10669,1.62674-.81851,2.03126l-6.3308,3.6542c.63539,3.4444,.63539,6.97599,0,10.42039h-.00002Zm-16.62309-5.2102c0-6.53246-5.29561-11.82807-11.82807-11.82807-6.53246,0-11.82806,5.2956-11.82806,11.82807,0,6.53246,5.2956,11.82807,11.82806,11.82807,6.5294-.00739,11.82067-5.29867,11.82807-11.82807Z"/><path class="b" d="M178.81543,75.481v-17.68168h-32.85352v-11.29346L173.91064,1.33252h21.33154V44.79492h8.78369v13.0044h-8.78369v17.68169h-16.42676Zm0-30.686V28.36816c0-4.44921,.22852-9.01171,.45654-13.80322h-.34229c-2.39551,4.79151-4.44873,9.126-6.9585,13.80322l-9.81055,16.19873-.11424,.228,16.76903,.00011Z"/></svg>

input/_Layout.cshtml

@@ -36,24 +36,24 @@
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href='@Context.GetLink("/assets/css/boxstarter.bundle.min.css")'>
-        <script type="text/javascript" src='@Context.GetLink("/assets/js/boxstarter-head.bundle.min.js")'></script>
+        <link rel="stylesheet" href='@Context.GetLink("/assets/css/boxstarter.min.purged.css")'>
+        <script type="text/javascript" src='@Context.GetLink("/assets/js/theme-toggle.min.js")'></script>
         <title>@title</title>
     </head>
     <body class="chocolatey-docs boxstarter-org">
         <header>
             @Html.Partial("global-partials/_TopAlertBanner")
-            <nav class="navbar navbar-expand-lg text-bg-theme-elevation-1">
+            <nav class="navbar navbar-expand-lg text-bg-body-secondary">
                 <div class="container-fluid">
                     <a class="navbar-brand link-theme" href="/">
                         <img src='@Context.GetLink("/assets/images/boxstarter-logo-sm.png")' alt="Boxstarter" width="70" height="61" class="d-inline-block align-text-middle">
                         Boxstarter
                     </a>
                     <div class="d-flex align-items-center justify-content-center">
                         <div class="d-flex me-3 d-lg-none">
-                            <label class="mb-0" for="themeToggle">
+                            <div>
                                 @Html.Partial("global-partials/_ThemeToggle")
-                            </label>
+                            </div>
                         </div>
                         <button class="navbar-toggler link-theme" type="button" data-bs-toggle="collapse" data-bs-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
                             <i class="fa-solid fa-bars"></i>
@@ -71,9 +71,9 @@
                                 <a class="nav-link link-theme px-lg-3" href="https://ch0.co/community"><i class="fa-brands fa-discord me-2"></i>Discussion</a>
                             </li>
                             <li class="nav-item d-none d-lg-flex px-lg-3">
-                                <label class="mb-0" for="themeToggle">
+                                <div>
                                     @Html.Partial("global-partials/_ThemeToggle")
-                                </label>
+                                </div>
                             </li>
                             <li class="nav-item pt-2 pt-lg-0 ps-lg-3">
                                 <a class="btn btn-primary d-block d-lg-inline-block" role="button" href='@Context.GetLink("/downloads/Boxstarter.3.0.3.zip")' download><i class="fa-solid fa-download me-2"></i>Download v3.0.3</a>
@@ -94,7 +94,7 @@
             <main>
                 <div class="container-fluid">
                     <div class="row">
-                        <div class="col-md-3 col-xl-2 p-0 text-bg-theme-elevation-1 border-end">
+                        <div class="col-md-3 col-xl-2 p-0 text-bg-body-secondary border-end">
                             <div id="leftSidebarNav" class="sticky-md-top collapse-y-height">
                                 @{
                                    IDocument root = OutputPages["index.html"].FirstOrDefault();
@@ -297,19 +297,18 @@
             </main>
         }
         <footer class="flex-shrink-0">
-            <div class="text-bg-theme-elevation-1 border-top text-center p-3">
+            <div class="text-bg-body-secondary border-top text-center p-3">
                 <span class="small">© 2018 - @DateTime.Today.Year <a class="link-theme" href="https://chocolatey.org/">Chocolatey Software, Inc.</a></span><br />
                 <span class="small">© 2012 - 2018 <a class="link-theme" href="https://www.hurryupandwait.io/">Matt Wrock</a></span><br />
                 <span class="small">Deployed from <a class="link-theme" href="https://github.com/chocolatey/boxstarter.org/commit/@VersionUtilities.GetSha()">@VersionUtilities.GetCommit()</a></span><br />
                 <span class="small"><a class="link-theme" href="https://statiq.dev/">Generated by Statiq</a></span>
             </div>
             <div id="cookieNoticeAlert" class="alert alert-primary alert-dismissible alert-dismissible-center alert-btn-center fade show d-none" role="alert">
                 <p class="mb-0"><strong>boxstarter.org uses cookies to enhance the user experience of the site.</strong></p>
-                <button type="button" class="btn btn-theme-background btn-sm d-none d-md-inline-block" data-bs-dismiss="alert" aria-label="Close">I accept</button>
-                <button type="button" class="btn btn-theme-background d-md-none" data-bs-dismiss="alert" aria-label="Close">I accept</button>
+                <button type="button" class="btn btn-bg-body btn-sm d-none d-md-inline-block" data-bs-dismiss="alert" aria-label="Close">I accept</button>
+                <button type="button" class="btn btn-bg-body d-md-none" data-bs-dismiss="alert" aria-label="Close">I accept</button>
             </div>
         </footer>
-        <script type="text/javascript" src="https://polyfill.io/v3/polyfill.min.js?features=default,Array.prototype.includes,Array.prototype.find,Number.parseFloat%2CNumber.parse%2CNodeList.prototype.forEach%2CNumber.parseInt"></script>
-        <script type="text/javascript" src='@Context.GetLink("/assets/js/boxstarter.bundle.min.js")'></script>
+        <script type="text/javascript" src='@Context.GetLink("/assets/js/boxstarter.min.js")'></script>
     </body>
 </html>