From 548342184e2173d6f39aba2462196ff8b397db8f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 6 Aug 2023 09:58:36 +0200 Subject: Adding upstream version 5.3.1+dfsg. Signed-off-by: Daniel Baumann --- site/layouts/_default/examples.html | 2 +- .../warning-color-assistive-technologies.md | 2 +- site/layouts/partials/docs-navbar.html | 6 ++---- site/layouts/partials/footer.html | 22 +++++++++++----------- site/layouts/partials/header.html | 2 -- site/layouts/partials/home/masthead.html | 2 -- site/layouts/partials/icons.html | 2 +- site/layouts/partials/scripts.html | 3 ++- site/layouts/partials/stylesheet.html | 2 -- site/layouts/shortcodes/js-docs.html | 8 +++++++- site/layouts/shortcodes/scss-docs.html | 8 +++++++- 11 files changed, 32 insertions(+), 27 deletions(-) (limited to 'site/layouts') diff --git a/site/layouts/_default/examples.html b/site/layouts/_default/examples.html index 5ec9263..11759a2 100644 --- a/site/layouts/_default/examples.html +++ b/site/layouts/_default/examples.html @@ -100,7 +100,7 @@ {{- end }} - + diff --git a/site/layouts/partials/callouts/warning-color-assistive-technologies.md b/site/layouts/partials/callouts/warning-color-assistive-technologies.md index aaa6f64..6750517 100644 --- a/site/layouts/partials/callouts/warning-color-assistive-technologies.md +++ b/site/layouts/partials/callouts/warning-color-assistive-technologies.md @@ -1 +1 @@ -**Accessibility tip:** Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies like screen readers. Please ensure the meaning is obvious from the content itself (e.g., the visible text) or is included through alternative means, such as additional text hidden with the `.visually-hidden` class. \ No newline at end of file +**Accessibility tip:** Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies like screen readers. Please ensure the meaning is obvious from the content itself (e.g., the visible text with a [*sufficient* color contrast](/docs/{{ .Site.Params.docs_version }}/getting-started/accessibility#color-contrast)) or is included through alternative means, such as additional text hidden with the `.visually-hidden` class. diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html index 2c1403c..a69fb2d 100644 --- a/site/layouts/partials/docs-navbar.html +++ b/site/layouts/partials/docs-navbar.html @@ -8,7 +8,7 @@ {{- else }} -
+
{{- end }} @@ -16,9 +16,7 @@
- {{ if eq .Layout "docs" }} - - {{ end }} +
@@ -37,21 +37,21 @@
Projects
Community
diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html index 22528ae..6323f49 100644 --- a/site/layouts/partials/header.html +++ b/site/layouts/partials/header.html @@ -11,9 +11,7 @@ -{{- if eq .Page.Layout "docs" -}} -{{- end }} {{ with .Params.robots -}} diff --git a/site/layouts/partials/home/masthead.html b/site/layouts/partials/home/masthead.html index 76cd010..4916e61 100644 --- a/site/layouts/partials/home/masthead.html +++ b/site/layouts/partials/home/masthead.html @@ -24,8 +24,6 @@ · Download · - v4.6.x docs - · All releases

{{ partial "ads" . }} diff --git a/site/layouts/partials/icons.html b/site/layouts/partials/icons.html index e181d8b..4ec1eab 100644 --- a/site/layouts/partials/icons.html +++ b/site/layouts/partials/icons.html @@ -1,4 +1,4 @@ - + diff --git a/site/layouts/partials/scripts.html b/site/layouts/partials/scripts.html index 3378a23..dc92d30 100644 --- a/site/layouts/partials/scripts.html +++ b/site/layouts/partials/scripts.html @@ -4,8 +4,9 @@ {{- end }} -{{ if eq .Page.Layout "docs" -}} + +{{ if eq .Page.Layout "docs" -}} {{- end }} diff --git a/site/layouts/partials/stylesheet.html b/site/layouts/partials/stylesheet.html index 1aa3296..7a5b077 100644 --- a/site/layouts/partials/stylesheet.html +++ b/site/layouts/partials/stylesheet.html @@ -1,6 +1,4 @@ -{{ if eq .Page.Layout "docs" -}} -{{- end }} {{ if eq hugo.Environment "production" -}} {{ if eq .Page.Params.direction "rtl" -}} 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 -}} +
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 -}} -- cgit v1.2.3