Chore: Merge branch 'main' into 'new-mf-tests'

Author: lamATnginx

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+end_of_line = lf

assets/css/v2/style.css

@@ -246,8 +246,9 @@ textarea:not([rows]) {
   --product-selector-background: 0.98 0 0;
 
   /* vars for the primary grid setup */
-  --grid-content: minmax(34rem, 50rem);
-  --grid-content-mobile: minmax(20rem, 50rem);
+  --grid-max: 50rem;
+  --grid-content: minmax(34rem, var(--grid-max));
+  --grid-content-mobile: minmax(20rem, var(--grid-max));
   --grid-side-callout: minmax(18rem, 26rem);
   --grid-column-gutter: 3.5rem;
 
@@ -313,7 +314,7 @@ textarea:not([rows]) {
   --sidebar-item-padding-tb: 0.25rem;
   --content-max-width: 88rem;
 
-  --main-col: minmax(34rem, 50rem);
+  --main-col: minmax(34rem, var(--grid-max));
   --side-col: minmax(18rem, 26rem);
 }
 
@@ -1929,6 +1930,7 @@ table {
   font-size: var(--font-step-0);
 
   td {
+    max-width: var(--grid-max);
     vertical-align: middle;
     padding: var(--table-inner-padding);
     background: transparent;
@@ -2011,9 +2013,22 @@ blockquote {
     margin: 0;
   }
 
+  /* Prevent codeblock x-axis overflow within callouts, retaining flow-gap for y */
+  .callout-content:has(.code-block) {
+    .code-block {
+      margin-right: 0;
+      margin-left: 0;
+    }
+  }
+
   .callout-content {
     margin: 0;
   }
+
+  /* To help them align with text, side callouts should not have top margin*/
+  &[data-grid="last-third"] {
+    --margin-callout: 0 0 0 1rem;
+  }
 }
 
 blockquote.note {
@@ -2387,6 +2402,10 @@ ul .code-block {
 
 .banner {
   margin-block-start: 1rem;
+
+  blockquote {
+    margin-left: 0rem;
+  }
 }
 
 /* MARK: Images

exampleSite/data/f5-sites.yaml

@@ -0,0 +1,7 @@
+- title: NGINX Documentation
+  url: https://docs.nginx.com/
+  description: Learn how to deliver, manage, and protect your applications using F5 NGINX products.
+
+- title: NGINX
+  url: https://nginx.org/
+  description: Learn more about NGINX Open Source and read the community blog

layouts/partials/f5-sites.html

@@ -0,0 +1,25 @@
+<div class="header__f5sites">
+{{ with index .Site.Data "f5-sites" }}
+{{ $f5Sites := . }}
+<div class="navbar navbar-nav">
+    <div class="nav-item-explore active">
+    <button id="navbar-sites-button" class="button navbar-button dropdown-button" data-testid="header__f5sites_button">
+        F5 Sites
+        <span class="header__f5sites--icon">
+        {{ partial "lucide" (dict "context" . "icon" "chevron-down") }}
+        </span>
+    </button>
+    <div class="dropdown-content" id="dropdown-content" data-testid="header__f5sites_content">
+        <ul>
+        {{ range $f5Sites }}
+            <li>
+            <a href="{{ .url }}" target="_blank" >{{ .title }}</a>
+            <p>{{ .description }}</p>
+            </li>
+        {{ end }}
+        </ul>
+    </div>
+    </div>
+</div>
+{{ end }}
+</div>

layouts/partials/header.html

@@ -28,35 +28,8 @@
           </a>
       </div>
 
-      <div class="header__f5sites" data-testid="header__f5sites">
-      {{ $f5Sites := slice
-        (dict "title" "DevCentral" "url" "https://community.f5.com/" "description" "Connect & learn in our hosted community")
-        (dict "title" "MyF5" "url" "https://my.f5.com/" "description" "Your key to everything F5, including support, registration keys, and subscriptions")
-        (dict "title" "NGINX" "url" "https://nginx.org/" "description" "Learn more about NGINX Open Source and read the community blog")
-      }}
+      {{ partial "f5-sites.html" . }}
 
-      <div class="navbar navbar-nav">
-          <div class="nav-item-explore active">
-            <button id="navbar-sites-button" class="button navbar-button dropdown-button" data-testid="header__f5sites__button">
-                F5 Sites
-                <span class="header__f5sites--icon">
-                {{ partial "lucide" (dict "context" . "icon" "chevron-down") }}
-                </span>
-            </button>
-            <div class="dropdown-content" id="dropdown-content" data-testid="header__f5sites__content">
-              <ul>
-                {{ range $f5Sites }}
-                  <li>
-                    <a href="{{ .url }}" target="_blank" >{{ .title }}</a>
-                    <p>{{ .description }}</p>
-                  </li>
-                {{ end }}
-              </ul>
-            </div>
-          </div>
-      </div>
-
-      </div>
   </div>
   <div class="header-search-dropdown" data-testid="header-search-dropdown-mobile">
     <atomic-external selector="#search-standalone-header">

layouts/partials/table.html

@@ -1,4 +1,4 @@
-{{$variant := .variant | default "narrow"}}
+{{$variant := .variant | default "wide"}}
 {{$theme := .theme | default "bordered"}}
 {{$dataGrid := cond (eq $variant "narrow") "first-two-thirds" (cond (eq $variant "wide") "wide" "") }}
 

layouts/shortcodes/bootstrap-table.html

@@ -1,4 +1,4 @@
-{{ $defaultVariant := "narrow" }}
+{{ $defaultVariant := "wide" }}
 
 {{ partial "table.html" (dict
     "variant" $defaultVariant