diff --git a/exampleSite/content/test-product/call-out/all-callouts.md b/exampleSite/content/test-product/call-out/all-callouts.md index e10e6a8d..fcd6a551 100644 --- a/exampleSite/content/test-product/call-out/all-callouts.md +++ b/exampleSite/content/test-product/call-out/all-callouts.md @@ -17,10 +17,6 @@ This is a plain callout with no title. It has a [link](#plain-callouts) to a hea This is a plain callout with a title. It has a [link](#plain-callouts) to a heading on this page. Its shortcode is `` with a custom title parameter. {{}} -{{}} -This is a plain callout with a default title for its type. It has a [link](#plain-callouts) to a heading on this page. Its shortcode is ``. -{{}} - ## Side Callouts Naturally, callouts should contain less text within them than the text it lives next to. We do this for several reasons. Firstly, it looks weird to have a big empty space in the primary content area. Secondly, if you have more text in the callout, then it stops being a callout. I have asked an LLM to lengthen this passage. @@ -71,24 +67,3 @@ And a final line. This is a Warning callout with a custom title. There was previously a bug with **bold text** that we should be aware of and continue to check for. This callout was invoked with the `` shortcode with the `.warning` class, and a custom title. {{}} - - - -## Old "plain" callouts -The following will not have special styling, but are pre-existing shortcodes. - -{{}} -This is ``. In oldframe it should have `note:` in bold, at the start. -{{}} - -{{}} -This is ``. In oldframe it should have `tip:` in bold, at the start. -{{}} - -{{}} -This is ``. -{{}} - -{{}} -This is ``. -{{}} diff --git a/exampleSite/content/test-product/call-out/call-out-code-lists.md b/exampleSite/content/test-product/call-out/call-out-code-lists.md index ec5f45e5..bbd05c1c 100644 --- a/exampleSite/content/test-product/call-out/call-out-code-lists.md +++ b/exampleSite/content/test-product/call-out/call-out-code-lists.md @@ -10,26 +10,26 @@ weight: 200 - **Using an instance's configuration for the group configuration**: If an instance is the first to join a config sync group and the group's configuration hasn't been defined, the instance’s configuration will become the group’s configuration. Any instances added later will automatically inherit this configuration. - {{< note >}} If you add multiple instances to a single config sync group, simultaneously (with automation), follow these steps. Your instances will inherit your desired configuration: + {{< call-out "note" >}} If you add multiple instances to a single config sync group, simultaneously (with automation), follow these steps. Your instances will inherit your desired configuration: 1. Create a config sync group. 1. Add a configuration to the config sync group, so all instances inherit it. 1. Add the instances in a separate operation. - Your instances should synchronize with your desired configuration within 30 seconds. {{< /note >}} + Your instances should synchronize with your desired configuration within 30 seconds. {{< /call-out >}} ## Text with Unordered List in note - **Using an instance's configuration for the group configuration**: If an instance is the first to join a config sync group and the group's configuration hasn't been defined, the instance’s configuration will become the group’s configuration. Any instances added later will automatically inherit this configuration. - {{< note >}} If you add multiple instances to a single config sync group, simultaneously (with automation), follow these steps. Your instances will inherit your desired configuration: + {{< call-out "note" >}} If you add multiple instances to a single config sync group, simultaneously (with automation), follow these steps. Your instances will inherit your desired configuration: - Create a config sync group. - Add a configuration to the config sync group, so all instances inherit it. - Add the instances in a separate operation. - Your instances should synchronize with your desired configuration within 30 seconds. {{< /note >}} + Your instances should synchronize with your desired configuration within 30 seconds. {{< /call-out >}} ## Callout within list diff --git a/exampleSite/content/test-product/everything.md b/exampleSite/content/test-product/everything.md index 1fd3f082..b99f46fb 100644 --- a/exampleSite/content/test-product/everything.md +++ b/exampleSite/content/test-product/everything.md @@ -4,12 +4,6 @@ title: Everything weight: 200 --- -## before-you-begin - -{{< before-you-begin >}} -Before you can set users' passwords, ensure you have [created users](#create-users) in NGINX Instance Manager. Once you've created the users, you can use one of the following options to set their passwords. -{{< /before-you-begin >}} - ## bootstrap-table {{}} @@ -60,10 +54,6 @@ This won't render anything. {{< include "nginx-openid-repo-note.txt" >}} -## see-also - -{{< see-also >}}See also!{{< /see-also >}} - ## details
@@ -75,11 +65,11 @@ And this is the content on how to do so.
example dynamic-agent.conf -{{}} +{{}} Default location in Linux environments: `/var/lib/nginx-agent/agent-dynamic.conf` Default location in FreeBSD environments: `/var/db/nginx-agent/agent-dynamic.conf` -{{}} +{{}} ```yaml # Dynamic configuration file for NGINX Agent. diff --git a/layouts/partials/callout.html b/layouts/partials/callout.html index aced821d..487df3f3 100644 --- a/layouts/partials/callout.html +++ b/layouts/partials/callout.html @@ -36,7 +36,7 @@
{{ partial "lucide" (dict "context" . "icon" $icon) . }} - {{ $title }} + {{ if $title }}{{ $title }}{{ else }}{{ $type }}{{end}}
{{- .content | markdownify -}} diff --git a/layouts/shortcodes/before-you-begin.html b/layouts/shortcodes/before-you-begin.html deleted file mode 100644 index fe13833d..00000000 --- a/layouts/shortcodes/before-you-begin.html +++ /dev/null @@ -1,8 +0,0 @@ - {{ partial "callout.html" (dict - "class" "tip" - "title" "Before you begin:" - "icon" "" - "sideline" "false" - "content" .Inner -) }} -{{ warnf "'' is being deprecated. Use generic 'call-out' shortcode instead. (%s)" .Position }} \ No newline at end of file diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html deleted file mode 100644 index d48a2053..00000000 --- a/layouts/shortcodes/note.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ partial "callout.html" (dict -"class" "note" -"title" "Note:" -"icon" "" -"sideline" "false" -"content" .Inner -) }} -{{ warnf "'' is being deprecated. Use generic 'call-out' shortcode instead. (%s)" .Position }} \ No newline at end of file diff --git a/layouts/shortcodes/see-also.html b/layouts/shortcodes/see-also.html deleted file mode 100644 index 9b350f99..00000000 --- a/layouts/shortcodes/see-also.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ partial "callout.html" (dict -"class" "tip" -"title" "See Also:" -"icon" "" -"sideline" "false" -"content" .Inner -) }} -{{ warnf "'' is being deprecated. Use generic 'call-out' shortcode instead. (%s)" .Position }} \ No newline at end of file diff --git a/layouts/shortcodes/tip.html b/layouts/shortcodes/tip.html deleted file mode 100644 index e8f0585a..00000000 --- a/layouts/shortcodes/tip.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ partial "callout.html" (dict -"class" "tip" -"title" "Tip:" -"icon" "" -"sideline" "false" -"content" .Inner -) }} -{{ warnf "'' is being deprecated. Use generic 'call-out' shortcode instead. (%s)" .Position }} \ No newline at end of file