summaryrefslogtreecommitdiffstats
path: root/site/layouts/shortcodes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-08-06 07:58:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-08-06 07:58:47 +0000
commit93d3b4da94cc34f7c55e39cfbed159f0e2886328 (patch)
tree72efc9b38e0e49fd402131e8c076523f14dc4f59 /site/layouts/shortcodes
parentReleasing debian version 5.3.0+dfsg-1. (diff)
downloadbootstrap-html-93d3b4da94cc34f7c55e39cfbed159f0e2886328.tar.xz
bootstrap-html-93d3b4da94cc34f7c55e39cfbed159f0e2886328.zip
Merging upstream version 5.3.1+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'site/layouts/shortcodes')
-rw-r--r--site/layouts/shortcodes/js-docs.html8
-rw-r--r--site/layouts/shortcodes/scss-docs.html8
2 files changed, 14 insertions, 2 deletions
diff --git a/site/layouts/shortcodes/js-docs.html b/site/layouts/shortcodes/js-docs.html
index 4739e0a..8eed4a0 100644
--- a/site/layouts/shortcodes/js-docs.html
+++ b/site/layouts/shortcodes/js-docs.html
@@ -13,8 +13,9 @@
{{- errorf "%s: %q: Missing required parameters! Got: name=%q file=%q!" .Position .Name $name $file -}}
{{- else -}}
{{- $capture_start := printf "// js-docs-start %s\n" $name -}}
- {{- $capture_end := printf "// js-docs-end %s" $name -}}
+ {{- $capture_end := printf "// js-docs-end %s\n" $name -}}
{{- $regex := printf `%s((?:.|\n)*)%s` $capture_start $capture_end -}}
+ {{- $regex_nested := printf `// js-docs-.*\n` -}}
{{- $match := findRE $regex (readFile $file) -}}
{{- $match = index $match 0 -}}
@@ -26,6 +27,11 @@
{{- $match = replace $match $capture_start "" -}}
{{- $match = replace $match $capture_end "" -}}
+ {{- $match_nested := findRE $regex_nested $match -}}
+ {{- range $to_remove := $match_nested -}}
+ {{- $match = replace $match $to_remove "" -}}
+ {{- end -}}
+
<div class="bd-example-snippet bd-code-snippet bd-file-ref">
<div class="d-flex align-items-center highlight-toolbar ps-3 pe-2 py-1 border-bottom">
<a class="font-monospace link-secondary link-underline-secondary link-underline-opacity-0 link-underline-opacity-100-hover small" href="{{ .Site.Params.repo }}/blob/v{{ .Site.Params.current_version }}/{{ $file | replaceRE `\\` "/" }}">
diff --git a/site/layouts/shortcodes/scss-docs.html b/site/layouts/shortcodes/scss-docs.html
index 4edc414..6e7c129 100644
--- a/site/layouts/shortcodes/scss-docs.html
+++ b/site/layouts/shortcodes/scss-docs.html
@@ -17,8 +17,9 @@
{{- errorf "%s: %q: Missing required parameters! Got: name=%q file=%q!" .Position .Name $name $file -}}
{{- else -}}
{{- $capture_start := printf "// scss-docs-start %s\n" $name -}}
- {{- $capture_end := printf "// scss-docs-end %s" $name -}}
+ {{- $capture_end := printf "// scss-docs-end %s\n" $name -}}
{{- $regex := printf `%s((?:.|\n)*)%s` $capture_start $capture_end -}}
+ {{- $regex_nested := printf `// scss-docs-.*\n` -}}
{{- /*
TODO: figure out why we can't do the following and get the first group (the only capturing one)...
@@ -35,6 +36,11 @@
{{- $match = replace $match $capture_start "" -}}
{{- $match = replace $match $capture_end "" -}}
+ {{- $match_nested := findRE $regex_nested $match -}}
+ {{- range $to_remove := $match_nested -}}
+ {{- $match = replace $match $to_remove "" -}}
+ {{- end -}}
+
{{- if (ne $strip_default "false") -}}
{{- $match = replace $match " !default" "" -}}
{{- end -}}