From 65e1ee68367bfe6d62207cae69f241de3d82b3a1 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 13 Nov 2023 10:05:35 +0300
Subject: [PATCH] Remove custom css and unnecessary div nesting of welcome
 panel

---
 app/assets/stylesheets/common.scss |  5 -----
 app/views/layouts/map.html.erb     | 28 +++++++++++++---------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 023dcdca7..bc599c17d 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -432,11 +432,6 @@ body.small-nav {
 
   .welcome {
     display: none;
-
-    p {
-      font-size: 110%;
-      font-weight: 300;
-    }
   }
 
   #banner {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index a3d303c53..646c22dea 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -43,21 +43,19 @@
     <% unless current_user %>
       <div class="welcome p-3" hidden>
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
-        <div>
-          <p><%= t "layouts.intro_text" %></p>
-          <p><%= t "layouts.hosting_partners_html",
-                   :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
-                   :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
-                   :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
-                   :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
-          </p>
-          <div class="d-flex mx-n1">
-            <div class="w-50 px-1">
-              <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
-            </div>
-            <div class="w-50 px-1">
-              <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
-            </div>
+        <p class="fs-6 fw-light"><%= t "layouts.intro_text" %></p>
+        <p class="fs-6 fw-light"><%= t "layouts.hosting_partners_html",
+                                       :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+                                       :fastly => link_to(t("layouts.partners_fastly"), "https://www.fastly.com/"),
+                                       :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+                                       :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+        </p>
+        <div class="d-flex mx-n1">
+          <div class="w-50 px-1">
+            <a class="btn btn-primary w-100" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+          </div>
+          <div class="w-50 px-1">
+            <a class="btn btn-primary w-100" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
           </div>
         </div>
       </div>
-- 
2.39.5