From 234052a6bac3f6202d187e0e9b38f762d62cc4bd Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Wed, 24 Jan 2024 14:50:24 +0100
Subject: [PATCH] moved Logo size to general.css and reduced size of header

---
 application/views/dashboard/index.php         |  4 ++--
 application/views/interface_assets/header.php |  2 +-
 application/views/user/forgot_password.php    |  2 +-
 application/views/user/login.php              |  2 +-
 application/views/visitor/index.php           |  2 +-
 application/views/visitor/layout/header.php   |  2 +-
 assets/css/general.css                        | 23 +++++++++++++------
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 351d2b001..934992c80 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -77,11 +77,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 
 	<?php if($this->optionslib->get_option('dashboard_banner') != "false") { ?>
 	<?php if($todays_qsos >= 1) { ?>
-		<div class="alert alert-success" role="alert">
+		<div class="alert alert-success" role="alert" style="margin-top: 1rem;">
 			  <?php echo lang('dashboard_you_have_had'); ?> <strong><?php echo $todays_qsos; ?></strong> <?php echo $todays_qsos != 1 ? lang('dashboard_qsos_today') : str_replace('QSOs', 'QSO', lang('dashboard_qsos_today')); ?>
 		</div>
 	<?php } else { ?>
-		<div class="alert alert-warning" role="alert">
+		<div class="alert alert-warning" role="alert" style="margin-top: 1rem;">
 			  <span class="badge text-bg-info"><?php echo lang('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo lang('notice_turn_the_radio_on'); ?>
 		</div>
 	<?php } ?>
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index e4157bfd1..369d0f34b 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -65,7 +65,7 @@
 
 	<nav class="navbar navbar-expand-lg navbar-light bg-light main-nav">
 		<div class="container">
-			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo'); ?>.png" alt="Logo" style="width:50px; height:50px;" /></a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
+			<a class="navbar-brand" href="<?php echo site_url(); ?>"><img class="headerLogo" src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('header_logo'); ?>.png" alt="Logo"/></a> <?php if (ENVIRONMENT == "development") { ?><span class="badge text-bg-danger"><?php echo lang('menu_badge_developer_mode'); ?></span><?php } ?>
 
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
 
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index 51f2b8442..59f471f6f 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -26,7 +26,7 @@ input[type="email"] {
 </style>
 
 <main class="form-forgot">
-    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
+    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block mainLogo" alt="">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <div class="text-center">
diff --git a/application/views/user/login.php b/application/views/user/login.php
index c589a389d..22a263789 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -30,7 +30,7 @@ body {
 }
 </style>
 <main class="form-signin">
-    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block" alt="" style="width:300px;height:300px;">
+    <img src="<?php echo base_url(); ?>assets/logo/<?php echo $this->optionslib->get_logo('main_logo'); ?>.png" class="mx-auto d-block mainLogo" alt="">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index 2805749d4..64e7ee446 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -48,7 +48,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 </div>
 
 <!-- Map -->
-<div id="map" class="map-leaflet" style="width: 100%; height: 350px"></div>
+<div id="map" class="map-leaflet" style="width: 100%; height: 365px"></div>
 
 <div id="container" style="padding-top: 0px; margin-top: 5px;" class="container dashboard">
 
diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index 9937f2efa..a363f84e9 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -42,7 +42,7 @@
 
 	<?php
 		if (!empty($slug)) {
-			echo '<a class="navbar-brand" href="' . site_url('visitor/'.$slug) .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_logo('header_logo') . '.png" alt="Logo" style="width:50px; height:50px;" /></a>';
+			echo '<a class="navbar-brand" href="' . site_url('visitor/'.$slug) .'"><img class="headerLogo" src="' . base_url() . 'assets/logo/' . $this->optionslib->get_logo('header_logo') . '.png" alt="Logo"/></a>';
 		} else {
 			echo '<a class="navbar-brand" href="' . site_url() .'"><img src="' . base_url() . 'assets/logo/' . $this->optionslib->get_logo('header_logo') . '.png" alt="Logo" style="width:50px; height:50px;" /></a>';
 		}
diff --git a/assets/css/general.css b/assets/css/general.css
index 1443a1e8e..d4daff757 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -29,8 +29,22 @@ thead>tr>td {
 	top: 45px;
 }
 
+.headerLogo {
+	width:		50px; 
+	height:		50px;
+}
+
+.mainLogo {
+	width:		300px; 
+	height:		300px;
+}
+
+.navbar {
+	--bs-navbar-padding-y: 0.25rem;
+}
+
 .dashboard {
-	padding-top: 15px;
+	padding-top: none;
 }
 
 .row.logdata {
@@ -701,9 +715,7 @@ table.dataTable tfoot td {
 .dropend .dropdown-toggle {
 	margin-left: 1em;
 }
-/*.dropdown .dropdown-menu {
-	display: none;
-}*/
+
 .dropdown:hover>.dropdown-menu, .dropend:hover>.dropdown-menu {
 	display: block;
 	/* margin-top: .125em; */
@@ -720,9 +732,6 @@ table.dataTable tfoot td {
 		margin-left: .5em;
 	}
 }
-/*.navbar-nav li:hover > ul.dropdown-menu {
-    display: block;
-}*/
 
 .dropdown-submenu {
     position:relative;