Merge pull request #4613 from sbwalker/dev

further modifications for #4604 - support for site name in logo component

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>

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
 }
 

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" />

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;

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;
 }