From f3851da10d90c6775e20bf8bea9acdf0a00ecc3f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 21 Oct 2024 16:02:54 +0200
Subject: [PATCH] add bootstrap class to only show fh logo in header on medium
 and greater displays; adjusted nav-user-btn css under mobile breakpoint to
 just take space of contained img and let searchbar flex growth apply to
 leftover width;

---
 application/views/templates/CISHMVC-Header.php | 5 +++--
 application/views/templates/CISHTML-Header.php | 4 ++--
 public/css/Cis4/Cis.css                        | 8 ++++----
 public/js/components/Cis/Menu.js               | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/views/templates/CISHMVC-Header.php b/application/views/templates/CISHMVC-Header.php
index cb454d77e..f45fb47a4 100644
--- a/application/views/templates/CISHMVC-Header.php
+++ b/application/views/templates/CISHMVC-Header.php
@@ -16,7 +16,8 @@ if (!isset($menu)) {
 	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
 		<span class="navbar-toggler-icon"></span>
 	</button>
-	<a id="nav-logo" href="<?= site_url(''); ?>">
+
+	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -53,4 +54,4 @@ if (!isset($menu)) {
 	</nav>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
+<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
\ No newline at end of file
diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index c3790cc95..eba22fc8f 100644
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -32,7 +32,7 @@ if (!isset($menu)) {
 		<span class="navbar-toggler-icon"></span>
 	</button>
 	<fhc-searchbar id="nav-search" class=" fhc-searchbar w-100" @updatesearchtypes="updatesearchtypes" :selectedtypes="selectedtypes" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>	
-	<a id="nav-logo" href="<?= site_url(''); ?>">
+	<a id="nav-logo" class="d-none d-md-block" href="<?= site_url(''); ?>">
 		<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
 	</a>
 	<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -64,4 +64,4 @@ if (!isset($menu)) {
 	</nav>
 </header>
 
-<main id="cis-main" class="flex-grow-1 overflow-scroll">
+<main id="cis-main" class="flex-grow-1 overflow-scroll">
\ No newline at end of file
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 87ab72d37..60a3baccd 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -352,12 +352,12 @@ html {
     position: relative;
   }
   #nav-user-btn {
-    width: 100%;
+
   }
   #nav-user-btn img {
     object-fit: cover;
-    height: 1.5rem;
-    width: 1.5rem;
+    height: 2rem;
+    width: 2rem;
   }
   #nav-user-menu {
     position: relative !important;
@@ -407,4 +407,4 @@ html {
   font-family: var(--fa-style-family, "Font Awesome 6 Free");
   font-weight: var(--fa-style, 900);
   margin-inline-start: 0.5rem;
-}
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 8ef389c49..c226eba6a 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -74,7 +74,7 @@ export default {
         <span class="navbar-toggler-icon"></span>
     </button>
 	<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
-    <a id="nav-logo" :href="rootUrl">
+    <a id="nav-logo" class="d-none d-md-block" :href="rootUrl">
         <img :src="logoUrl" alt="Logo">
     </a>
 	<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
@@ -102,4 +102,4 @@ export default {
 			</div>
 		</div>
     </nav>`
-};
+};
\ No newline at end of file