From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 May 2024 17:37:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4823'
X-Git-Tag: live~1035
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6e71f16bbbdf3da35fc064c354c4078ea48edcbf?hp=e488e4cf6780f651c986e6450fa9c1d80560e900

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 81674c805..0edb3b0fc 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -107,14 +107,8 @@ header {
     padding: $lineheight * 0.5;
   }
 
-  img.logo {
-    margin-top: -2px;
-  }
-
   h1 {
     font-size: 18px;
-    line-height: 1.2;
-    padding-top: 15px;
   }
 
   .btn {
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a628b647d..8516efc49 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,7 +1,7 @@
 <header class="d-flex bg-body text-nowrap closed z-3">
-  <h1 class="m-0 fw-semibold">
-    <a href="<%= root_path %>" class="text-body-emphasis 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" %>
+  <h1 class="d-flex m-0 fw-semibold">
+    <a href="<%= root_path %>" class="icon-link gap-1 text-body-emphasis text-decoration-none geolink">
+      <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :size => 30 %>
       <%= t "layouts.project_name.h1" %>
     </a>
   </h1>