Refactor the welcome page to use the bootstrap grid and alert box

The two columns work well side-by-side even at small screen widths.

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3d013339df6e6d370247192d84ad93fcf9bb13bb..018f36217f130342b458cb91563033acf28b5e98 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2627,11 +2627,6 @@ input.richtext_title[type="text"] {
     text-decoration: none;
   }
 
-  .note-box {
-    margin-top: 20px;
-    background-color: $offwhite;
-  }
-
   .icon.note {
     background-color: #333;
     border-radius: 4px;

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index dc6a519dfeed144f584cd803b96cf47dff8bbc68..4617935e768cc49c6a80ca9c9a151a47d1233532 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -10,15 +10,15 @@
 
 <h3><%= t ".whats_on_the_map.title" %></h3>
 
-<div class=' clearfix'>
-  <div class='col6 inner11'>
-    <div class='center clearfix inner11'>
+<div class='row'>
+  <div class='col'>
+    <div class='center'>
       <span class='sprite small check'></span>
     </div>
     <p><%= t ".whats_on_the_map.on_html" %></p>
   </div>
-  <div class='col6 inner11'>
-    <div class='center clearfix inner11'>
+  <div class='col'>
+    <div class='center'>
       <span class='sprite small x'></span>
     </div>
     <p><%= t ".whats_on_the_map.off_html" %></p>
@@ -29,7 +29,7 @@
 
 <p><%= t ".basic_terms.paragraph_1_html" %></p>
 
-<div class='col12 clearfix icon-list'>
+<div class='clearfix icon-list'>
   <div class='clearfix'>
     <span class='sprite small term editor'></span>
     <p><%= t ".basic_terms.editor_html" %></p>
@@ -48,26 +48,24 @@
   </div>
 </div>
 
-<div class='col12 clearfix icon-list'>
+<div class='clearfix icon-list'>
   <h3><%= t ".rules.title" %></h3>
   <span class='sprite small term rules'></span>
   <p><%= t ".rules.paragraph_1_html" %></p>
 </div>
 
-<div class='col12 clearfix icon-list'>
+<div class='clearfix icon-list'>
   <h3><%= t ".questions.title" %></h3>
   <span class='sprite small term question'></span>
   <p><%= t ".questions.paragraph_1_html", :help_url => help_path %></p>
 </div>
 
 <div class='clearfix center'>
-  <a href="<%= edit_path %>" class="button start-mapping"><%= t ".start_mapping" %></a>
+  <p><a href="<%= edit_path %>" class="button start-mapping"><%= t ".start_mapping" %></a></p>
 </div>
 
-<div class='note-box'>
-  <div class='inner22'>
-    <h3><%= t ".add_a_note.title" %></h3>
-    <p><%= t ".add_a_note.paragraph_1_html" %></p>
-    <p><%= t ".add_a_note.paragraph_2_html", :map_url => root_path %></p>
-  </div>
+<div class='alert alert-primary'>
+  <h3><%= t ".add_a_note.title" %></h3>
+  <p><%= t ".add_a_note.paragraph_1_html" %></p>
+  <p><%= t ".add_a_note.paragraph_2_html", :map_url => root_path %></p>
 </div>