From 1dc1c0322508ee9ab9f576d25531471d61441890 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 3 Feb 2021 13:34:59 +0000
Subject: [PATCH] Rework welcome message to use bootstrap buttons

I also reworked the layout to use flex utilities and avoid using a white button border as a spacing hack. In future this will be better done with start/end utilities, avoiding the need to be fancy with negative margins.
---
 app/assets/stylesheets/common.scss | 15 ---------------
 app/views/layouts/map.html.erb     | 24 +++++++++++++++---------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3a8b97fbc..c010691c6 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -448,26 +448,11 @@ body.compact-nav {
 
   .welcome {
     display: none;
-    padding-bottom: 5px;
 
     p {
-      padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
       font-weight: 300;
     }
-
-    .button {
-      width: 50%;
-      float: left;
-      margin: 0;
-      border-radius: 0;
-      font-weight: normal;
-      padding: .6em;
-
-      &.learn-more {
-        border-right: 1px solid #fff;
-      }
-    }
   }
 
   #banner {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 33737ae23..0403bc889 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -41,15 +41,21 @@
     <% unless current_user %>
       <div class="welcome">
         <%= render "sidebar_header", :title => t("layouts.intro_header") %>
-        <p><%= t "layouts.intro_text" %></p>
-        <p><%= t "layouts.hosting_partners_html",
-                 :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
-                 :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="standard-form">
-          <a class="button learn-more" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
-          <a class="button sign-up" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>
+        <div class="px-3 pb-3">
+          <p><%= t "layouts.intro_text" %></p>
+          <p><%= t "layouts.hosting_partners_html",
+                   :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+                   :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>
       </div>
     <% end %>
-- 
2.39.5