From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Tue, 23 Jul 2024 07:14:26 +0000 (+0200)
Subject: Merge branch 'main' into main-lmp-docs-example-refactoring
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmain-lmp-docs-example-refactoring;p=thirdparty%2Fbootstrap.git

Merge branch 'main' into main-lmp-docs-example-refactoring
---

8a102dd7bc75af4ef932159a9f0a9d6a7f2732d2
diff --cc site/content/docs/5.3/docsref.md
index e56a6abd39,5a16470c59..28cac19ec1
--- a/site/content/docs/5.3/docsref.md
+++ b/site/content/docs/5.3/docsref.md
@@@ -60,10 -45,6 +61,10 @@@ sitemap
  <div class="test">This is a test.</div>
  {{< /example >}}
  
 +{{< example class=bg-body-secondary >}}
 +<div class="test">This is a test with a custom background color.</div>
 +{{< /example >}}
 +
  {{< scss-docs name="variable-gradient" file="scss/_variables.scss" >}}
  
- {{< js-docs name="live-toast" file="site/assets/js/snippets.js" >}}
+ {{< js-docs name="live-toast" file="site/assets/js/partials/snippets.js" >}}
diff --cc site/layouts/shortcodes/example.html
index 5082920b2b,5b398e6814..40944fbb6b
--- a/site/layouts/shortcodes/example.html
+++ b/site/layouts/shortcodes/example.html
@@@ -20,21 -20,21 +20,21 @@@
  {{- $content := .Inner -}}
  
  <div class="bd-example-snippet bd-code-snippet">
-   {{- if eq $show_preview true -}}
+   {{- if eq $show_preview true }}
    <div{{ with $id }} id="{{ . }}"{{ end }} class="bd-example m-0 border-0{{ with $class }} {{ . }}{{ end }}">
-     {{- $input -}}
+     {{ $content }}
    </div>
-   {{- end -}}
+   {{- end }}
  
 -  {{- if eq $show_markup true -}}
 -    {{- if eq $show_preview true -}}
 -      <div class="d-flex align-items-center highlight-toolbar ps-3 pe-2 py-1 border-0 border-top border-bottom">
 -        <small class="font-monospace text-body-secondary text-uppercase">{{ $lang }}</small>
 -        <div class="d-flex ms-auto">
 -          <button type="button" class="btn-edit text-nowrap"{{ with $stackblitz_add_js }} data-sb-js-snippet="{{ $stackblitz_add_js }}"{{ end }} title="Try it on StackBlitz">
 -            <svg class="bi" aria-hidden="true"><use xlink:href="#lightning-charge-fill"/></svg>
 -          </button>
 -          <button type="button" class="btn-clipboard mt-0 me-0" title="Copy to clipboard">
 +  <div class="d-flex align-items-center highlight-toolbar ps-3 pe-2 py-1">
-     <small class="font-monospace text-body-secondary text-uppercase">{{- $lang -}}</small>
++    <small class="font-monospace text-body-secondary text-uppercase">{{ $lang }}</small>
 +    <div class="d-flex ms-auto">
 +      {{- if eq $show_preview true -}}
 +        <button type="button" class="btn-edit text-nowrap"{{ with $stackblitz_add_js }} data-sb-js-snippet="{{ $stackblitz_add_js }}"{{ end }} title="Try it on StackBlitz">
 +          <svg class="bi" aria-hidden="true"><use xlink:href="#lightning-charge-fill"/></svg>
 +        </button>
 +      {{- end -}}
 +      <button type="button" class="btn-clipboard mt-0 me-0" title="Copy to clipboard">
              <svg class="bi" aria-hidden="true"><use xlink:href="#clipboard"/></svg>
            </button>
          </div>