From fb9454fb2abcbf160ccf0202e5a8996850f928e5 Mon Sep 17 00:00:00 2001 From: Travis Martin <33876974+travisamartin@users.noreply.github.com> Date: Fri, 5 Aug 2022 10:32:26 -0700 Subject: [PATCH] Bump f5-theme to v0.22.1 for main (#2910) fix: f5-theme bump to v0.22.1 (cherry picked from commit 4390d0635dd7e199440171855696ef4c237fed96) --- .../poc/f5-hugo/archetypes/concept.md | 31 +++++--- .../poc/f5-hugo/archetypes/default.md | 72 +++++++++-------- .../poc/f5-hugo/archetypes/openapi.md | 5 +- .../poc/f5-hugo/archetypes/reference.md | 32 +++++--- .../poc/f5-hugo/archetypes/troubleshooting.md | 30 ++++++- .../poc/f5-hugo/archetypes/tutorial.md | 12 ++- .../poc/f5-hugo/assets/css/f5-hugo.css | 43 +++++++++- .../poc/f5-hugo/layouts/_default/baseof.html | 6 +- .../poc/f5-hugo/layouts/partials/footer.html | 7 +- .../poc/f5-hugo/layouts/partials/gtm.html | 4 - .../f5-hugo/layouts/partials/list-main.html | 2 +- .../poc/f5-hugo/layouts/partials/meta.html | 4 +- .../poc/f5-hugo/layouts/partials/sidebar.html | 75 +++++++++++++----- .../layouts/partials/tealium-profile.html | 5 ++ .../layouts/partials/universal-tag.html | 8 ++ .../f5-hugo/layouts/shortcodes/versions.html | 2 +- .../icons/NGINX-Amplify-product-icon-RGB.png | Bin 0 -> 2696 bytes .../NGINX-App-Protect-DoS-product-icon.png | Bin 0 -> 3041 bytes .../NGINX-App-Protect-WAF-product-icon.png | Bin 0 -> 2702 bytes .../NGINX-Controller-product-icon-RGB.png | Bin 0 -> 2876 bytes .../NGINX-Docs-new-docs-dark-1200x630.png | Bin 0 -> 23713 bytes .../NGINX-Docs-new-docs-square-381x327.png | Bin 0 -> 6766 bytes ...INX-F5-DNS-Cloud-Services-product-icon.png | Bin 0 -> 2612 bytes .../NGINX-Ingress-Controller-product-icon.png | Bin 0 -> 2413 bytes .../NGINX-Instance-Manager-product-icon.png | Bin 0 -> 2647 bytes ...GINX-Management-Suite-product-icon-RGB.png | Bin 0 -> 2753 bytes .../NGINX-Management-Suite-product-icon.svg | 68 ++++++++++++++++ .../icons/NGINX-Plus-product-icon-RGB.png | Bin 0 -> 2570 bytes .../icons/NGINX-Service-Mesh-product-icon.png | Bin 0 -> 2829 bytes .../icons/NGINX-Unit-product-icon-RGB.png | Bin 0 -> 2352 bytes .../icons/NGINX-WAF-product-icon-RGB.png | Bin 0 -> 2424 bytes .../icons/NGINX-for-Azure-product-icon.png | Bin 0 -> 7692 bytes .../images/icons/NGINX-product-icon.png | Bin 0 -> 2511 bytes docs/_vendor/modules.txt | 2 +- docs/go.mod | 2 +- docs/go.sum | 2 + 36 files changed, 309 insertions(+), 103 deletions(-) delete mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/gtm.html create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/tealium-profile.html create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/universal-tag.html create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Amplify-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-App-Protect-DoS-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-App-Protect-WAF-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Controller-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Docs-new-docs-dark-1200x630.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Docs-new-docs-square-381x327.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-F5-DNS-Cloud-Services-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Ingress-Controller-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Instance-Manager-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Management-Suite-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Management-Suite-product-icon.svg create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Plus-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Service-Mesh-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-Unit-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-WAF-product-icon-RGB.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-for-Azure-product-icon.png create mode 100644 docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/static/images/icons/NGINX-product-icon.png diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/concept.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/concept.md index 6256c81f4d..0cd1d29f6b 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/concept.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/concept.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false toc: true tags: [ "docs" ] # Create a new entry in the Jira DOCS Catalog and add the ticket ID (DOCS-) below @@ -22,18 +25,20 @@ authors: [] --- ## Overview - -Provide a brief introduction to the subject matter, in the context of the product. You do not have to provide background information on the subject in general. - -For example, if you're writing about how the controller uses RBAC to authenticate users, you don't have to explain the concept of RBAC. - -## Heading 1 - + +Briefly describe the goal of this document, that is, what the user will learn or accomplish by reading what follows. + +## Concept 1 - format as a noun phrase + This is where you explain the concept. Provide information that will help the user understand what the element/feature is and how it fits into the overall product. - + Organize content in this section with H3 and H4 headings. - + +## Concept 2 - format as a noun phrase + +## Concept 3 - format as a noun phrase + ## What's Next - -Provide up to 5 links to related topics (optional). -Format as a bulleted list. \ No newline at end of file + +- Provide up to 5 links to related topics (optional). +- Format as a bulleted list. \ No newline at end of file diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/default.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/default.md index ade56a87be..cd76c9171f 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/default.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/default.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc. draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false toc: true tags: [ "docs" ] # Create a new entry in the Jira DOCS Catalog and add the ticket ID (DOCS-) below @@ -23,51 +26,54 @@ authors: [] --- ## Overview - -Provide a brief introduction to the subject matter, in the context of the product. You do not have to provide background information on the subject in general. - -For example, if you're writing about how the controller uses RBAC to authenticate users, you don't have to explain the concept of RBAC. - + +Briefly describe the goal of this document, that is, what the user will learn or accomplish by reading what follows. + +Introduce and explain any new concepts the user may need to understand before proceeding. + ## Before You Begin - + +To complete the instructions in this guide, you need the following: + 1. Provide any prerequisites here. 2. Format as a numbered or bulleted list as appropriate. - -## Goal 1 - -These sections contain the "what" and "how" information. - -The header for each section should tell the user **what** they will accomplish by completing the steps in that section. - -Provide steps that tell the user **how** to complete the goal. - +3. Keep the list entries grammatically parallel.1. Provide any prerequisites here. + +## Goal 1 - write as a verb phrase + +Add introductory text. Say what the user will be doing. + +To do xzy, take the following steps: + 1. This is where you provide the steps that the user must take to accomplish the goal. - + ```bash code examples should be nested within the list ``` - + 2. Format as numbered lists. + + {{< note >}}Add notes like this.{{}} + 3. If there is only one step, you don't need to format it as a numbered list. - -### Goal 1.a - -Use sub-sections as needed to organize content into easily scannable chunks. - -## Goal 2 - -## Goal 3 - + +## Goal 2 - write as a verb phrase + +## Goal 3 - write as a verb phrase + ## Discussion - + Use the discussion section to expand on the information presented in the steps above. - + This section contains the "why" information. - + This information lives at the end of the document so that users who just want to follow the steps don't have to scroll through a wall of explanatory text to find them. - + +## Verification + +Explain how the user can verify the steps completed successfully. + ## What's Next - + - Provide up to 5 links to related topics (optional). - Format as a bulleted list. - \ No newline at end of file diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/openapi.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/openapi.md index 2b08f46b47..3109b5b5a6 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/openapi.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/openapi.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false doctypes: ["reference"] toc: true tags: [ "api" ] diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/reference.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/reference.md index a2d008a15a..4ff270d4ed 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/reference.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/reference.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false toc: true tags: [ "docs" ] # Create a new entry in the Jira DOCS Catalog and add the ticket ID (DOCS-) below @@ -22,16 +25,19 @@ authors: [] --- ## Overview - -Provide a brief introduction to the subject matter, in the context of the product. You do not have to provide background information on the subject in general. - -For example, if you're writing about how the controller uses RBAC to authenticate users, you don't have to explain the concept of RBAC. - -## Reference Material - -Provide reference material here. This may be tables, paragraphs, imported code, etc. - + +Briefly describe the goal of this document, that is, what the user will learn or accomplish by reading what follows. + +Introduce and explain any new concepts the user may need to understand before proceeding. +## Reference 1 - format as a noun phrase + +Provide reference material here. This may be tables, paragraphs, imported code, etc. + +## Reference 2 - format as a noun phrase + +## Reference 3 - format as a noun phrase + ## What's Next - -Provide up to 5 links to related topics (optional). -Format as a bulleted list. + +- Provide up to 5 links to related topics (optional). +- Format as a bulleted list. diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/troubleshooting.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/troubleshooting.md index 8fc768899e..5bdf9e72a4 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/troubleshooting.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/troubleshooting.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false toc: true tags: [ "docs" ] # Create a new entry in the Jira DOCS Catalog and add the ticket ID (DOCS-) below @@ -21,3 +24,28 @@ versions: [] authors: [] --- +## Overview + +Briefly describe the goal of this document, that is, what the user will accomplish by reading what follows. + +## Issue 1 - write as a verb phrase + +Explain the issue. Include any identifying details, such as error messages. + +When the system does xyz, you may see an error similar to the following: + +```text +error message here +``` + +This issue is caused by -- add cause here. + +To resolve the issue, take the following steps: + +1. The steps +2. To take to +3. Resolve the issue. + +## Issue 2 - write as a verb phrase + +## Issue 3 - write as a verb phrase \ No newline at end of file diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/tutorial.md b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/tutorial.md index afd09ce1ec..849b760ca0 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/tutorial.md +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/archetypes/tutorial.md @@ -1,11 +1,14 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +# Change draft status to false to publish doc draft: true +# Description +# Add a short description (150 chars) for the doc. Include keywords for SEO. +# The description text appears in search results and at the top of the doc. description: "" # Assign weights in increments of 100 weight: -draft: false toc: true tags: [ "docs" ] # Create a new entry in the Jira DOCS Catalog and add the ticket ID (DOCS-) below @@ -24,14 +27,17 @@ authors: [] ## Overview -Provide a brief introduction to the subject matter, in the context of the product. You do not have to provide background information on the subject in general. +Briefly describe the goal of this document, that is, what the user will learn or accomplish by reading what follows. -For example, if you're writing about how the controller uses RBAC to authenticate users, you don't have to explain the concept of RBAC. +Introduce and explain any new concepts the user may need to understand before proceeding. ## Before You Begin +To complete the instructions in this guide, you need the following: + 1. Provide any prerequisites here. 2. Format as a numbered or bulleted list as appropriate. +3. Keep the list entries grammatically parallel. ## Lesson 1 diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/assets/css/f5-hugo.css b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/assets/css/f5-hugo.css index e176d4157a..feb7ac4a81 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/assets/css/f5-hugo.css +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/assets/css/f5-hugo.css @@ -59,6 +59,8 @@ ol > li > ol { .card-deck { padding-bottom: 2em; + width: -webkit-fill-available; + width: -moz-available } .card-holder { @@ -91,6 +93,42 @@ ol > li > ol { height: 100%; } + .saas-card { + display: flex; +} + +.saas-icon { + width: 46px; + margin-right: 5px; +} + +.saas-description { + flex: 75%; + +} + +.saas-title { + overflow-wrap: normal; + padding-top: 4px; + padding-bottom: 4px; +} + +h3.saas-title a { + color: #000; +} + +h3.saas-title a:hover { + color: var(--nginx-green); +} + +h3.saas-title { + font-style: normal; + font-weight: bold; + font-size: 24px; + line-height: 28px; +} + + a.products-card { display: block; transition: transform 150ms ease-in-out; @@ -160,7 +198,8 @@ ol > li > ol { } .card-img.list { - width: 40px; + width: auto; + height: 40px; } .img-large { @@ -939,13 +978,13 @@ main a:hover { position: sticky; top: 0rem; align-self: start; + height: 100vh; } #sidebar { display: block; font-size: 1.2em; overflow: auto; - min-height: 100vh; } #sidebar.content > h3 { diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/_default/baseof.html b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/_default/baseof.html index 3f8c40edb1..789177bcb0 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/_default/baseof.html +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/_default/baseof.html @@ -24,6 +24,8 @@ {{ partial "trustarc.html" . }} + {{ partial "tealium-profile.html" . }} + {{ end }} {{ end }} @@ -32,7 +34,7 @@ {{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }} - {{ partial "gtm.html" . }} + {{ partial "universal-tag.html" . }} {{ end }}
@@ -45,7 +47,7 @@ {{ end }} {{ end }} -
+
{{ block "main" . }}{{ end }} diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/footer.html b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/footer.html index 41d4ebf7ad..1c2c92290c 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/footer.html +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/footer.html @@ -43,12 +43,13 @@ Products
diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/gtm.html b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/gtm.html deleted file mode 100644 index ef3ed877af..0000000000 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/gtm.html +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/list-main.html b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/list-main.html index 674647b265..4764807617 100644 --- a/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/list-main.html +++ b/docs/_vendor/gitlab.com/f5/nginx/controller/poc/f5-hugo/layouts/partials/list-main.html @@ -1,6 +1,6 @@
-