From c74065ff266e42f1c8ebc5654d14a51a9a8490ed Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Sun, 15 Sep 2024 09:30:04 -0400
Subject: [PATCH] further modifications for #4604 - support for site name in
 logo component

---
 Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor       | 2 +-
 Oqtane.Client/Themes/Controls/Theme/Logo.razor              | 6 +++---
 Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor       | 2 +-
 .../wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css      | 4 ++++
 Oqtane.Server/wwwroot/css/app.css                           | 6 ++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index a4f651f5..2682018f 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -9,7 +9,7 @@
 <div class="row flex-xl-nowrap gx-0">
     <div class="sidebar">
         <nav class="navbar">
-            <Logo ShowName="true" />
+            <Logo UseSiteNameAsFallback="true" />
             <Menu Orientation="Vertical" />
         </nav>
     </div>
diff --git a/Oqtane.Client/Themes/Controls/Theme/Logo.razor b/Oqtane.Client/Themes/Controls/Theme/Logo.razor
index 50beea35..3e1f26d7 100644
--- a/Oqtane.Client/Themes/Controls/Theme/Logo.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/Logo.razor
@@ -11,16 +11,16 @@
 }
 else
 {
-    if (ShowName)
+    if (UseSiteNameAsFallback)
     {
         <span class="app-logo">
-            <a class="site-name" href="@PageState.Alias.Path">@PageState.Site.Name</a>
+            <a class="navbar-brand" href="@PageState.Alias.Path">@PageState.Site.Name</a>
         </span>
     }
 }
 
 @code {
     [Parameter]
-    public bool ShowName { get; set; } = false;
+    public bool UseSiteNameAsFallback { get; set; } = false; // indicates if the site name should be displayed in scenarios where a site does not have a logo defined
 }
 
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index d56c6f78..4814ad2a 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -4,7 +4,7 @@
 
 <main role="main">
     <nav class="navbar navbar-dark bg-primary fixed-top">
-        <Logo ShowName="true" /><Menu Orientation="Horizontal" />
+        <Logo UseSiteNameAsFallback="true" /><Menu Orientation="Horizontal" />
         <div class="controls ms-auto">
             <div class="controls-group">
                 <Search CssClass="me-3 text-center bg-primary" />
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index 2e8a7265..99020c83 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -117,6 +117,10 @@
     margin: .5rem;
 }
 
+.app-logo .navbar-brand {
+    color: white;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index e265b423..85350ca6 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -269,8 +269,6 @@ app {
     min-height: 250px;
 }
 
-.app-logo .site-name {
-    padding: 0 20px 0 20px;
-    font-size: x-large;
-    color: white;
+.app-logo .navbar-brand {
+    padding: 5px 20px 5px 20px;
 }
\ No newline at end of file