From aea7de6b139fc8f5fb2ab004e45956cca55b2eba Mon Sep 17 00:00:00 2001
From: Patrick Andrew Hartnett <phartnett@sdl.com>
Date: Tue, 29 Jul 2025 14:01:33 +0200
Subject: [PATCH] =?UTF-8?q?Update=20docFx=20Template=20+=20Rebranding=20lo?=
 =?UTF-8?q?go=20-=20Use=20new=20logo=20(rebranding)=20-=20Re-introduce=20t?=
 =?UTF-8?q?he=20search=20icon=20in=20the=20Nav->Search=20control=20-=20Fix?=
 =?UTF-8?q?=20formatting=20issue=20with=20toc=20expand=20char=20"=E2=80=BA?=
 =?UTF-8?q?"=20-=20Update=20alignment=20+=20spacing=20around=20the=20icon?=
 =?UTF-8?q?=20in=20the=20Toc->Filter=20control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RWSTemplate/logo.svg                     | 43 +++++++++++++-----
 RWSTemplate/partials/navbar.tmpl.partial |  1 +
 RWSTemplate/styles/docfx.css             | 44 +++++++++++--------
 RWSTemplate/styles/docfx.js              | 56 +++++++++++++++++-------
 RWSTemplate/styles/main.css              | 32 +++++++++-----
 5 files changed, 119 insertions(+), 57 deletions(-)

diff --git a/RWSTemplate/logo.svg b/RWSTemplate/logo.svg
index dcbf19735..0f52374c9 100644
--- a/RWSTemplate/logo.svg
+++ b/RWSTemplate/logo.svg
@@ -1,24 +1,45 @@
-<svg id="Layer_1" data-name="Layer 1" height="50" width="83" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 48">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1358.5 209">
   <defs>
     <style>
       .cls-1 {
-        fill: #00a89f;
+        stroke: #000;
+        stroke-width: 6.53px;
       }
 
-      .cls-2 {
-        fill: #003d7f;
+      .cls-1, .cls-2 {
+        fill: none;
       }
 
       .cls-3 {
-        fill: #808184;
+        fill: #3e016f;
+      }
+
+      .cls-4 {
+        fill: #8353fd;
+      }
+
+      .cls-5 {
+        fill: #e60054;
+      }
+
+      .cls-6 {
+        clip-path: url(#clippath);
       }
     </style>
+    <clipPath id="clippath">
+      <rect class="cls-2" width="1358.5" height="209"/>
+    </clipPath>
   </defs>
   <title>RWS Developers</title>
-  <rect class="cls-1" y="15.24" width="8.03" height="8.03" />
-  <circle class="cls-2" cx="8.63" cy="23.87" r="5.2" />
-  <rect class="cls-1" y="24.47" width="8.03" height="8.03" />
-  <rect class="cls-1" x="9.23" y="15.24" width="8.03" height="8.03" />
-  <path class="cls-3"
-    d="M73.84,32.75c3.62,0,6.16-1.92,6.16-5.15v-.05c0-2.86-1.9-4.17-5.55-5.06-3.3-.78-4.09-1.38-4.09-2.71v-.05c0-1.13,1-2,2.81-2a7.85,7.85,0,0,1,4.69,1.77l1.62-2.29A9.52,9.52,0,0,0,73.22,15c-3.43,0-5.89,2.05-5.89,5v.05c0,3.18,2.07,4.27,5.74,5.16,3.21.74,3.9,1.4,3.9,2.63v.05c0,1.31-1.19,2.17-3.06,2.17a8,8,0,0,1-5.45-2.24L66.64,30a10.62,10.62,0,0,0,7.2,2.76M45.42,32.5H48l4.21-12.31L56.43,32.5H59l6-17.25H61.84L57.75,28,53.54,15.2H51L46.79,28,42.7,15.25H39.45ZM26.35,23.8V18h4.42c2.24,0,3.57,1,3.57,2.86v.05c0,1.75-1.38,2.88-3.55,2.88Zm-3,8.7h3v-6h3.8l4.24,6H38L33.31,26a5.18,5.18,0,0,0,4.11-5.23v0A5.19,5.19,0,0,0,36,17a7,7,0,0,0-5-1.72H23.32Z" />
+  <g class="cls-6">
+      <path d="M190.29,75.49h16.71c1.39,0,2.52,1.12,2.52,2.51v12.93c0,.21.17.38.39.38.17,0,.32-.11.37-.27,2.61-8.77,11.12-16.56,25.92-16.56,1.45,0,3.07.08,4.74.38,1.19.21,2.05,1.27,2.05,2.47v13.46c0,1.47-1.27,2.63-2.74,2.49-1.39-.13-2.69-.19-4.05-.19-14.61,0-26.67,8.8-26.67,29.44v38.44c0,1.38-1.12,2.51-2.52,2.51h-16.71c-1.39,0-2.52-1.12-2.52-2.51v-82.98c0-1.38,1.12-2.51,2.52-2.51h0Z"/>
+      <path d="M389.73,135.73h14.63c1.18,0,2.18.83,2.45,1.97,1.9,7.87,8.71,11.06,18.16,11.06s15.97-3.22,15.97-10.66c0-5.42-3.57-8.12-10.36-9.47l-16.31-3.55c-17.83-4.06-24.8-13.37-24.8-25.21,0-16.58,14.27-26.06,35.5-26.06s33.87,9.63,35.36,26.55c.13,1.46-1.04,2.72-2.52,2.72h-13.26c-1.18,0-2.18-.82-2.45-1.97-1.93-8.12-8.13-10.9-16.96-10.9-9.68,0-14.61,3.22-14.61,9.31,0,5.08,3.57,8.29,10.7,9.64l16.82,3.72c13.93,3.22,25.31,9.31,25.31,24.71,0,19.46-18.01,27.58-38.56,27.58-21.7,0-36.14-8.76-37.59-26.73-.12-1.46,1.05-2.72,2.52-2.72h0Z"/>
+      <path d="M302.9,155.59l15.61-51.33,15.45,51.3c1.72,5.72,7,9.63,13,9.63h3.02c6.12,0,11.48-4.08,13.09-9.96l20.99-76.57c.44-1.59-.77-3.17-2.43-3.17h-15.46c-1.16,0-2.17.79-2.44,1.91l-15.92,64.59c-.05.2-.23.34-.43.34s-.37-.13-.42-.32l-18.58-64.7c-.31-1.08-1.3-1.82-2.42-1.82h-15.06c-1.12,0-2.11.74-2.42,1.82l-18.58,64.7c-.05.19-.23.32-.42.32s-.38-.14-.43-.34l-15.92-64.59c-.27-1.12-1.29-1.91-2.44-1.91h-15.29c-1.66,0-2.86,1.57-2.43,3.16l20.84,76.55c1.6,5.89,6.97,9.98,13.1,9.98h3.03c5.98,0,11.25-3.9,12.99-9.6h0Z"/>
+      <path class="cls-4" d="M93.27,128.45c-30.18,0-54.64-24.37-54.64-54.43,0-4.89.65-9.63,1.86-14.14C17.17,66.09,0,87.28,0,112.47c0,15.61,6.6,29.69,17.17,39.61l37.47,37.32,37.47-37.32c.39-.37.78-.74,1.16-1.12v-22.51Z"/>
+      <path class="cls-5" d="M93.27,19.59c-25.27,0-46.53,17.08-52.78,40.29,4.51-1.2,9.25-1.84,14.15-1.84,30.18,0,54.64,24.37,54.64,54.43,0,15.03-6.12,28.64-16.01,38.49l37.47-37.32c10.57-9.92,17.17-24,17.17-39.61,0-30.06-24.46-54.43-54.64-54.43h0Z"/>
+      <path class="cls-3" d="M54.64,58.04c-4.89,0-9.63.64-14.15,1.84-1.21,4.51-1.86,9.25-1.86,14.14,0,30.06,24.46,54.43,54.64,54.43v22.51c9.89-9.85,16.01-23.46,16.01-38.49,0-30.06-24.46-54.43-54.64-54.43h0Z"/>
+      <line class="cls-1" x1="571.48" y1="0" x2="571.48" y2="209"/>
+      <path d="M679.51,163.28v-91.44h34.62c28.48,0,43.24,16.33,43.24,45.72s-14.76,45.72-43.24,45.72h-34.62ZM712.17,146.3c18.68,0,25.21-8.62,25.21-28.74s-6.53-28.74-25.21-28.74h-13.06v57.47h13.06ZM799.89,164.59c-17.24,0-34.22-9.54-34.22-35.4s16.07-35.14,34.09-35.14,32.26,9.14,32.26,34.88c0,2.48-.13,3.79-.39,5.23h-47.81c1.04,11.36,6.92,15.94,16.33,15.94,8.75,0,12.54-3.53,14.11-9.01h16.85c-3.4,15.54-15.41,23.51-31.22,23.51ZM783.82,122.92h30.17c-.26-7.84-4.31-14.37-14.76-14.37-8.88,0-14.11,4.96-15.41,14.37ZM857.81,163.28l-24.69-67.92h19.46l16.98,49.64h.65l16.98-49.64h19.33l-24.69,67.92h-24.03ZM941.87,164.59c-17.24,0-34.22-9.54-34.22-35.4s16.07-35.14,34.09-35.14,32.26,9.14,32.26,34.88c0,2.48-.13,3.79-.39,5.23h-47.81c1.05,11.36,6.92,15.94,16.33,15.94,8.75,0,12.54-3.53,14.11-9.01h16.85c-3.4,15.54-15.41,23.51-31.22,23.51ZM925.8,122.92h30.17c-.26-7.84-4.31-14.37-14.76-14.37-8.88,0-14.11,4.96-15.41,14.37ZM984.26,163.28v-91.44h19.07v91.44h-19.07ZM1047.74,164.59c-17.11,0-34.09-10.58-34.09-35.27s16.98-35.27,34.09-35.27,34.09,10.58,34.09,35.27-16.98,35.27-34.09,35.27ZM1047.74,148.78c9.14,0,16.2-6.01,16.2-19.46s-7.05-19.46-16.2-19.46-16.2,6.01-16.2,19.46,7.05,19.46,16.2,19.46ZM1092.18,188.1v-92.74h19.07v9.8c2.48-5.88,9.93-11.1,19.99-11.1,14.24,0,29.78,10.32,29.78,35.27s-15.54,35.27-29.78,35.27c-10.06,0-17.5-5.23-19.99-11.1v34.62h-19.07ZM1126.67,148.78c8.49,0,16.33-6.14,16.33-19.46s-7.84-19.46-16.33-19.46-16.2,6.14-16.2,19.46,7.84,19.46,16.2,19.46ZM1202.99,164.59c-17.24,0-34.22-9.54-34.22-35.4s16.07-35.14,34.09-35.14,32.26,9.14,32.26,34.88c0,2.48-.13,3.79-.39,5.23h-47.81c1.05,11.36,6.92,15.94,16.33,15.94,8.75,0,12.54-3.53,14.11-9.01h16.85c-3.4,15.54-15.41,23.51-31.22,23.51ZM1186.92,122.92h30.17c-.26-7.84-4.31-14.37-14.76-14.37-8.88,0-14.11,4.96-15.41,14.37ZM1245.39,163.28v-67.92h19.07v16.46h.52c2.35-9.93,8.75-17.24,19.59-17.24,1.57,0,3.27.13,5.23.65v16.07c-2.09-.26-3.66-.39-5.36-.39-10.19,0-19.99,5.88-19.99,22.34v30.04h-19.07ZM1323.41,164.59c-18.16,0-29.26-7.97-29.39-23.64h17.11c.65,6.4,4.96,9.41,12.41,9.41,6.4,0,10.71-2.22,10.71-7.05,0-3.14-2.09-5.09-6.53-6.01l-12.54-2.61c-14.24-3.27-19.33-10.84-19.33-19.86,0-13.19,11.36-20.77,27.82-20.77,18.16,0,27.69,8.88,27.95,23.51h-15.94c-.78-6.79-5.23-9.27-11.76-9.27s-9.54,2.35-9.54,6.01c0,3.4,2.48,5.62,7.05,6.53l12.8,2.74c10.71,2.35,19.59,7.32,19.59,19.33,0,15.15-13.98,21.68-30.44,21.68Z"/>
+  </g>
 </svg>
\ No newline at end of file
diff --git a/RWSTemplate/partials/navbar.tmpl.partial b/RWSTemplate/partials/navbar.tmpl.partial
index 995c57a7f..4f18a57ba 100644
--- a/RWSTemplate/partials/navbar.tmpl.partial
+++ b/RWSTemplate/partials/navbar.tmpl.partial
@@ -14,6 +14,7 @@
     <div class="collapse navbar-collapse" id="navbar">
       <form class="navbar-form navbar-right" role="search" id="search">
         <div class="form-group">
+          <span class="glyphicon glyphicon-search search-icon"></span>
           <input type="text" class="form-control" id="search-query" placeholder="{{__global.search}}" autocomplete="off">
         </div>
       </form>
diff --git a/RWSTemplate/styles/docfx.css b/RWSTemplate/styles/docfx.css
index b02c64f6f..ce502eed2 100644
--- a/RWSTemplate/styles/docfx.css
+++ b/RWSTemplate/styles/docfx.css
@@ -26,6 +26,15 @@ a {
   cursor: pointer;
 }
 
+#logo {
+    margin-top: 6px;
+    vertical-align: middle;
+    max-width: 100%;
+    height: auto;
+    display: block;
+    width: 209px;
+}
+
 button:hover,
 button:focus,
 a:hover,
@@ -614,20 +623,21 @@ body .toc {
   transform: rotate(90deg);
 }
 
-.toc .nav>li>.expand-stub::before,
-.toc .nav>li.active>.expand-stub::before {
-  color: var(--highlight-light);
-  color: var(--font-color);
-  display: inline-block;
-  height: .9rem;
-  width: 1.2rem;
-  text-align: center;
-  overflow: hidden;
-  content: "›";
-  font-size: 1.5rem;
-  line-height: .9rem;
-  transform: rotate(0deg);
-  transition: 350ms ease-out;
+.toc .nav > li > .expand-stub::before,
+.toc .nav > li.active > .expand-stub::before {
+    color: var(--font-color);
+    display: inline-block;
+    height: 2rem;
+    width: 1.5rem; 
+    line-height: 1.5rem; 
+    text-align: center;
+    overflow: visible;
+    content: "›";
+    font-size: 2rem;
+    font-weight: bold;
+    transform: rotate(0deg);
+    transition: 350ms ease-out;
+    vertical-align: middle; 
 }
 
 .toc .nav > li.filtered > ul,
@@ -756,7 +766,7 @@ body .toc {
 
 .toc-filter > input {
   color: var(--input-text);
-  padding-left: 2.3rem;
+  padding-left: 3rem;
   padding-right: 1rem;
   width: 100%;
   height: calc(1.5em + 8px); /* Adjust height by adding 5 pixels */
@@ -772,11 +782,9 @@ body .toc {
 .toc-filter > .filter-icon {
   position: absolute;
   top: 2px;
-  left: 5px;
+  left: 8px;
 }
 
-
-
 .toc-filter>.clear-icon {
   position: absolute;
   text-align: center;
diff --git a/RWSTemplate/styles/docfx.js b/RWSTemplate/styles/docfx.js
index 399435091..594ed490a 100644
--- a/RWSTemplate/styles/docfx.js
+++ b/RWSTemplate/styles/docfx.js
@@ -730,26 +730,50 @@ $(function () {
       var imgClass = $img.attr('class');
       var imgURL = $img.attr('src');
 
-      jQuery.get(imgURL, function (data) {
-        // Get the SVG tag, ignore the rest
-        var $svg = jQuery(data).find('svg');
+        jQuery.get(imgURL, function (data) {
+            // Get the SVG tag, ignore the rest
+            var $svg = jQuery(data).find('svg');
 
-        // Add replaced image's ID to the new SVG
-        if (typeof imgID !== 'undefined') {
-          $svg = $svg.attr('id', imgID);
-        }
-        // Add replaced image's classes to the new SVG
-        if (typeof imgClass !== 'undefined') {
-          $svg = $svg.attr('class', imgClass + ' replaced-svg');
-        }
+            // Add replaced image's ID to the new SVG
+            if (typeof imgID !== 'undefined') {
+                $svg = $svg.attr('id', imgID);
+            }
+            // Add replaced image's classes to the new SVG
+            if (typeof imgClass !== 'undefined') {
+                $svg = $svg.attr('class', imgClass + ' replaced-svg');
+            }
 
-        // Remove any invalid XML tags as per http://validator.w3.org
-        $svg = $svg.removeAttr('xmlns:a');
+            // Remove any invalid XML tags as per http://validator.w3.org
+            $svg = $svg.removeAttr('xmlns:a');
+
+            // Fix clip-path URLs in styles
+            $svg.find('[style]').each(function () {
+                var style = jQuery(this).attr('style');
+                if (style && style.indexOf('url(#clippath)') !== -1) {
+                    var uniqueId = 'clippath-' + Math.floor(Math.random() * 10000);
+                    // Find <clipPath> element and update id
+                    $svg.find('clipPath#clippath').attr('id', uniqueId);
+                    // Replace url reference to unique id
+                    style = style.replace(/url\(#clippath\)/g, 'url(#' + uniqueId + ')');
+                    jQuery(this).attr('style', style);
+                }
+            });
+
+            // Also fix clip-path references in attributes (e.g. clip-path="url(#clippath)")
+            $svg.find('[clip-path]').each(function () {
+                var cpValue = jQuery(this).attr('clip-path');
+                if (cpValue && cpValue.indexOf('url(#clippath)') !== -1) {
+                    var uniqueId = 'clippath-' + Math.floor(Math.random() * 10000);
+                    $svg.find('clipPath#clippath').attr('id', uniqueId);
+                    var newValue = cpValue.replace(/url\(#clippath\)/g, 'url(#' + uniqueId + ')');
+                    jQuery(this).attr('clip-path', newValue);
+                }
+            });
 
-        // Replace image with new SVG
-        $img.replaceWith($svg);
+            // Replace image with new SVG
+            $img.replaceWith($svg);
 
-      }, 'xml');
+        }, 'xml');
     });
   }
 
diff --git a/RWSTemplate/styles/main.css b/RWSTemplate/styles/main.css
index 942fac937..b7fafbfbf 100644
--- a/RWSTemplate/styles/main.css
+++ b/RWSTemplate/styles/main.css
@@ -74,9 +74,12 @@
 .tile-container {
     display: flex; /* Enable flexbox */
     flex-wrap: wrap; /* Allow tiles to wrap to the next line */
-    justify-content: space-between; /* Space tiles evenly */
+    justify-content: left; /* Space tiles evenly */
     margin-top: 20px; /* Margin between sections */
 }
+.tile h3 {
+    margin-top: 10px;   
+}
 
 .tile {
     background-color: #f5f5f5; /* Background color */
@@ -441,17 +444,22 @@ article h4 {
 }
 
 .navbar-form .search-icon {
-  position: absolute;
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-  color: var(--input-text);
-  background-color: transparent;
-  width: 2rem;
-  height: 32px;
-  line-height: 32px;
-  left: 0px;
-  text-align: center;
-  z-index: 2;
+    position: absolute;
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    color: var(--input-text);
+    background-color: transparent;
+    width: 2rem;
+    height: 32px;
+    line-height: 32px;
+    left: 0px;
+    text-align: center;
+    z-index: 2;
+    padding-left: 10px;
+}
+
+.navbar-form #search-query {
+    padding-left: 32px; 
 }
 
 /* NAVBAR TOGGLED (small screens) */