From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Oct 2023 17:49:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4295'
X-Git-Tag: live~564
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/83d9f1f1642d71f3b590e7ee33b22e4c5da00c53?hp=2ce6bf383a7855e0f2e7b1c3fb7bc7d4cec49120

Merge remote-tracking branch 'upstream/pull/4295'
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 91f846902..73226a518 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -109,31 +109,14 @@ header {
     float: left;
   }
 
-  a, a:hover {
-    text-decoration: none;
-  }
-
   img.logo {
-    width: 30px;
-    height: 30px;
     margin-top: -2px;
-    vertical-align: middle;
   }
 
   h1 {
     font-size: 18px;
-    font-weight: 600;
     line-height: 1.2;
-    margin: 0;
     padding-top: 15px;
-
-    a {
-      color: #000;
-    }
-
-    a:hover {
-      color: #000;
-    }
   }
 
   .btn {
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 5f0d0d4d2..fb5c01839 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,7 +1,7 @@
 <header class="closed clearfix">
-  <h1>
-    <a href="<%= root_path %>" class="geolink">
-      <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %>
+  <h1 class="m-0 fw-semibold">
+    <a href="<%= root_path %>" class="text-black text-decoration-none geolink">
+      <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :width => 30, :height => 30, :class => "logo" %>
       <%= t "layouts.project_name.h1" %>
     </a>
   </h1>