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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 88a8047debee9156cb9333f8bee847ff61a8bf12..2cfd5eba732348b338be53952e627319efc59f5c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -683,9 +683,7 @@ tr.turn {
 /* Rules for non-map content pages */
 
 .content-inner {
-  position: relative;
   max-width: 960px;
-  margin: auto;
   padding: $lineheight;
 }
 

diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb
index 9e28c0771b867d49122a178f181aed49bbd962b3..7e7cd2cca67f7fea406eedfdda976c6d25df6494 100644 (file)
--- a/app/views/layouts/_content.html.erb
+++ b/app/views/layouts/_content.html.erb
@@ -5,13 +5,13 @@
     <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
     <% if content_for? :heading %>
       <div class="content-heading bg-body-secondary border-bottom border-secondary-subtle">
-        <div class="content-inner <%= yield :heading_class %>">
+        <div class="content-inner position-relative m-auto <%= yield :heading_class %>">
           <%= yield :heading %>
         </div>
       </div>
     <% end %>
     <div class="content-body">
-      <div class="content-inner">
+      <div class="content-inner position-relative m-auto">
         <%= yield %>
       </div>
     </div>