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

[rails.git] / app / views / site / welcome.html.erb

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index b05620f599efbbc74ed6f32603d4c2e77d312f45..eacccf5789f28d4214433be930847bd55f0213c1 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -29,22 +29,22 @@
 
 <p><%= t ".basic_terms.paragraph_1" %></p>
 
-<div class='clearfix'>
-  <div class='clearfix'>
-    <span class='sprite small term editor float-start'></span>
-    <p><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></p>
+<div>
+  <div class='align-middle mb-2'>
+    <span class='sprite small term editor'></span>
+    <span><%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %></span>
   </div>
-  <div class='clearfix'>
-    <span class='sprite small term node float-start'></span>
-    <p><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></p>
+  <div class='align-middle mb-2'>
+    <span class='sprite small term node'></span>
+    <span><%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %></span>
   </div>
-  <div class='clearfix'>
-    <span class='sprite small term way float-start'></span>
-    <p><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></p>
+  <div class='align-middle mb-2'>
+    <span class='sprite small term way'></span>
+    <span><%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %></span>
   </div>
-  <div class='clearfix'>
-    <span class='sprite small term tag float-start'></span>
-    <p><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></p>
+  <div class='align-middle mb-2'>
+    <span class='sprite small term tag'></span>
+    <span><%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %></span>
   </div>
 </div>
 
@@ -60,12 +60,18 @@
 </div>
 
 <div class='clearfix text-center'>
-  <p class="display-5"><a href="<%= edit_path %>" class="button start-mapping"><%= t ".start_mapping" %></a></p>
+  <p class="display-5">
+<% if params[:oauth_return_url] %>
+  <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
+<% else %>
+  <a class="button btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+<% end %>
+  </p>
 </div>
 
 <div class='alert alert-primary'>
   <h2><%= t ".add_a_note.title" %></h2>
   <p><%= t ".add_a_note.para_1" %></p>
   <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
-                                      :note_icon => tag.span(:class => "icon note") %></p>
+                                      :note_icon => tag.span(:class => "icon note bg-dark rounded-1") %></p>
 </div>