Fixes

twbs · Nov 26, 2022 · 8c8aa82 · 8c8aa82
1 parent 0068f88
commit 8c8aa82
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 46 deletions.
diff --git a/docs/content/docs.md b/docs/content/docs.md
@@ -227,4 +227,3 @@ Found another issue with SVGs we should note? Please open [an issue]({{< param r
 {{< /md >}}
   </div>
 </div>
-
diff --git a/docs/content/icons/hand-thumbs-down-fill.md b/docs/content/icons/hand-thumbs-down-fill.md
@@ -6,5 +6,4 @@ tags:
   - hand
   - pointer
   - thumbs-down
-  - "-1"
 ---
diff --git a/docs/content/icons/hand-thumbs-down.md b/docs/content/icons/hand-thumbs-down.md
@@ -6,5 +6,4 @@ tags:
   - hand
   - pointer
   - thumbs-down
-  - "-1"
 ---
diff --git a/docs/content/icons/hand-thumbs-up-fill.md b/docs/content/icons/hand-thumbs-up-fill.md
@@ -6,5 +6,4 @@ tags:
   - hand
   - pointer
   - thumbs-up
-  - "+1"
 ---
diff --git a/docs/content/icons/hand-thumbs-up.md b/docs/content/icons/hand-thumbs-up.md
@@ -6,5 +6,4 @@ tags:
   - hand
   - pointer
   - thumbs-up
-  - "+1"
 ---
diff --git a/docs/layouts/_default/home.html b/docs/layouts/_default/home.html
@@ -11,7 +11,7 @@
           <input class="form-control search mb-0" id="search" type="search" placeholder="Search icons..." autocomplete="off">
         </form>
 
-        <h6><a href="/docs">Documentation</a></h6>
+        <h6><a href="{{ .Site.Params.main }}/docs/">Documentation</a></h6>
         <ul class="nav nav-pills flex-column bd-sidebar-list">
           <li class="nav-item">
             <a class="nav-link" href="">Install</a>
@@ -23,16 +23,16 @@ <h6><a href="/docs">Documentation</a></h6>
             <a class="nav-link" href="">Styling</a>
           </li>
         </ul>
-        <h6><a href="/categories">Categories</a></h6>
+        <h6><a href="/categories/">Categories</a></h6>
         <ul id="categories" class="nav nav-pills flex-column bd-sidebar-list">
-        {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-          {{ if eq "categories" $taxonomyname }}
-            {{ range $key, $value := $taxonomy }}
+        {{ range $taxonomyName, $taxonomy := .Site.Taxonomies -}}
+          {{ if eq "categories" $taxonomyName -}}
+            {{ range $key, $value := $taxonomy -}}
               <li class="nav-item">
                 <a class="nav-link" href="#{{ $key }}">{{ $key | humanize }}</a>
               </li>
-            {{ end }}
-          {{ end }}
+            {{ end -}}
+          {{ end -}}
         {{ end }}
         </ul>
       </div>

diff --git a/docs/layouts/_default/taxonomy.html b/docs/layouts/_default/taxonomy.html
@@ -8,17 +8,16 @@
 
   <h1 class="h2 mb-4">All {{ .Type }}</h1>
   <div class="grid category-grid">
-    {{ range .Data.Pages }}
+    {{ range .Data.Pages -}}
       <a class="category-grid-item d-block text-decoration-none link-dark hover-link-primary" href="{{ .Permalink }}">
         <div class="d-flex flex-wrap justify-content-center p-3 mb-3 text-dark border rounded-3 fs-2 hover-border-primary hover-shadow-primary" style="min-height: 140px">
-          {{ range first 10 (where .Data.Pages ".Params.categories" "intersect" (slice .Title)) }}
-            {{ $name := .Title | urlize }}
+          {{ range first 10 (where .Data.Pages ".Params.categories" "intersect" (slice .Title)) -}}
+            {{- $name := .Title | urlize -}}
             <i class="bi bi-{{ $name }}"></i>
-          {{ end }}
+          {{ end -}}
         </div>
         <h2 class="fs-5">{{ .Title }}</h2>
       </a>
-    {{ end }}
+    {{ end -}}
   </div>
-{{ end }}
-
+{{ end -}}
diff --git a/docs/layouts/icons/single.html b/docs/layouts/icons/single.html
@@ -14,15 +14,15 @@ <h1>{{ .Title }}</h1>
       <ul class="list-unstyled mb-3 mb-md-0">
         <li>
           <strong>Category:</strong>
-          {{ range .Params.categories }}
-            <a href="/categories/{{ . | urlize}}">{{ . }}</a>
-          {{ end }}
+          {{ range .Params.categories -}}
+            <a href="/categories/{{ . | urlize }}/">{{ . }}</a>
+          {{ end -}}
         </li>
         <li>
           <strong>Tags:</strong>
-          {{ range .Params.tags }}
-            <a href="/tags/{{ . | urlize}}">{{ . }}</a>
-          {{ end }}
+          {{ range .Params.tags -}}
+            <a href="/tags/{{ . | urlize }}/">{{ . }}</a>
+          {{ end -}}
         </li>
       </ul>
       {{- end }}

diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html
@@ -7,17 +7,17 @@
           <span class="fs-5">Bootstrap</span>
         </a>
         <ul class="list-unstyled small text-muted">
-          <li class="mb-2">Designed and built with all the love in the world by the <a href="/docs/{{ .Site.Params.docs_version }}/about/team/">Bootstrap team</a> with the help of <a href="{{ .Site.Params.repo }}/graphs/contributors">our contributors</a>.</li>
+          <li class="mb-2">Designed and built with all the love in the world by the <a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/about/team/">Bootstrap team</a> with the help of <a href="{{ .Site.Params.repo }}/graphs/contributors">our contributors</a>.</li>
           <li class="mb-2">Code licensed <a href="{{ .Site.Params.repo }}/blob/main/LICENSE.md" target="_blank" rel="license noopener">MIT</a>.</li>
           <li class="mb-2">Currently v{{ .Site.Params.version }}.</li>
         </ul>
       </div>
       <div class="col-6 col-lg-2 offset-lg-1 mb-3">
         <h5>Links</h5>
         <ul class="list-unstyled">
-          <li class="mb-2"><a href="/">Home</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/">Docs</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/examples/">Examples</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}">Home</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/">Docs</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/examples/">Examples</a></li>
           <li class="mb-2"><a href="{{ .Site.Params.icons }}">Icons</a></li>
           <li class="mb-2"><a href="{{ .Site.Params.themes }}">Themes</a></li>
           <li class="mb-2"><a href="{{ .Site.Params.blog }}">Blog</a></li>
@@ -27,11 +27,11 @@ <h5>Links</h5>
       <div class="col-6 col-lg-2 mb-3">
         <h5>Guides</h5>
         <ul class="list-unstyled">
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/getting-started/">Getting started</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/examples/starter-template/">Starter template</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/getting-started/webpack/">Webpack</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/getting-started/parcel/">Parcel</a></li>
-          <li class="mb-2"><a href="/docs/{{ .Site.Params.docs_version }}/getting-started/vite/">Vite</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/getting-started/">Getting started</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/examples/starter-template/">Starter template</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/getting-started/webpack/">Webpack</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/getting-started/parcel/">Parcel</a></li>
+          <li class="mb-2"><a href="{{ .Site.Params.main }}/docs/{{ .Site.Params.docs_version }}/getting-started/vite/">Vite</a></li>
         </ul>
       </div>
       <div class="col-6 col-lg-2 mb-3">

diff --git a/docs/layouts/partials/icons.html b/docs/layouts/partials/icons.html
@@ -1,29 +1,28 @@
 <div class="my-5">
   <ul class="list-unstyled list">
-    {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-      {{ if eq "categories" $taxonomyname }}
-        {{ range $key, $value := $taxonomy }}
+    {{ range $taxonomyName, $taxonomy := .Site.Taxonomies -}}
+      {{ if eq "categories" $taxonomyName -}}
+        {{ range $key, $value := $taxonomy -}}
           <li class="my-5" id="{{ $key }}">
             <h3 class="d-flex align-items-center gap-3 pb-3 mb-4 border-bottom">
-              <a href="/categories/{{ $key }}" class="link-dark text-decoration-none">
+              <a href="/categories/{{ $key }}/" class="link-dark text-decoration-none">
                 {{ $key | humanize }}
               </a>
               <small class="badge fs-6 text-muted bg-light rounded-pill">{{ .Count }}</small>
             </h3>
             <ul class="row row-cols-3 row-cols-sm-4 row-cols-lg-4 row-cols-xl-6 list-unstyled">
-              {{ range first 24 ($value.Pages) }}
-                {{ partial "icon" . }}
-              {{ end }}
+              {{ range first 24 ($value.Pages) -}}
+                {{- partial "icon" . -}}
+              {{ end -}}
             </ul>
             {{ if gt .Count 24 }}
-            <a class="d-block py-3 btn btn-subtle" href="/categories/{{ $key }}">
+            <a class="d-block py-3 btn btn-subtle" href="/categories/{{ $key }}/">
               View all {{ .Count }}
             </a>
             {{ end }}
           </li>
-        {{ end }}
-      {{ end }}
-    {{ end }}
+        {{ end -}}
+      {{ end -}}
+    {{ end -}}
   </ul>
 </div>
-