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~542
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/83d9f1f1642d71f3b590e7ee33b22e4c5da00c53?hp=-c

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

83d9f1f1642d71f3b590e7ee33b22e4c5da00c53
diff --combined app/assets/stylesheets/common.scss
index 91f846902,44b32a58b..73226a518
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -109,31 -109,14 +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 {
@@@ -187,6 -170,22 +170,6 @@@ nav.secondary 
      color: darken($darkgrey, 25%);
    }
  
 -  .login-menu {
 -    .btn-outline-secondary {
 -      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);
 -    }
 -  }
 -
 -  .user-menu {
 -    .btn-outline-secondary {
 -      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
 -      border-color: $grey;
 -      &:hover {
 -        border-color: $grey;
 -      }
 -    }
 -  }
 -
    #inboxanchor {
      background-color: lighten($grey, 10%);
    }
diff --combined app/views/layouts/_header.html.erb
index 5f0d0d4d2,204cc16f0..fb5c01839
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -1,7 -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>
@@@ -60,7 -60,7 +60,7 @@@
          <%= link_to t("layouts.about"), about_path, :class => "nav-link" %>
        </li>
        <li id="compact-secondary-nav" class="dropdown nav-item">
 -        <button class="dropdown-toggle nav-link btn" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
 +        <button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-white text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
          <ul class="dropdown-menu">
            <% if Settings.status != "database_offline" && can?(:index, Issue) %>
              <li class="<%= current_page_class(issues_path) %>">
@@@ -81,7 -81,7 +81,7 @@@
      </ul>
      <% if current_user && current_user.id %>
        <div class='d-inline-flex dropdown user-menu logged-in clearfix'>
 -        <button class='dropdown-toggle btn btn-outline-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
 +        <button class='dropdown-toggle btn btn-outline-secondary border-grey bg-white text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
            <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1") %>
            <%= render :partial => "layouts/inbox" %>
            <span class="user-button">