From de559f3fe36ac9c6660d6f9958f2d777154d53b3 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 19 Feb 2020 11:08:15 -0500
Subject: [PATCH] FIX: Remove border-box from modal-body to avoid iOS fixed
 position bug

---
 .../discourse/templates/modal/change-owner.hbs     |  4 +++-
 .../discourse/templates/modal/feature-topic.hbs    |  2 --
 .../stylesheets/common/base/cat_reorder.scss       |  5 ++++-
 app/assets/stylesheets/common/base/modal.scss      |  6 ++----
 .../stylesheets/common/base/topic-admin-menu.scss  | 14 +++++++++-----
 .../common/components/share-and-invite-modal.scss  |  1 +
 app/assets/stylesheets/mobile/modal.scss           |  6 +++++-
 .../stylesheets/common/discourse-local-dates.scss  |  1 +
 8 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index d7c33abbf05..0c0890f2b96 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,5 +1,7 @@
 {{#d-modal-body class='change-ownership'}}
-  {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+  <span>
+    {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
+  </span>
 
   <form>
     <label></label>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 1e798af2860..965a4078155 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -69,7 +69,6 @@
         </p>
       </div>
     </div>
-    <hr>
     <div class="feature-section">
       <div class="desc">
         <p>
@@ -119,7 +118,6 @@
     </div>
   {{/if}}
   {{#if currentUser.staff}}
-    <hr>
     <div class="feature-section">
       <div class="desc">
         <p>
diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss
index 8abc2038615..085f1f8e9f4 100644
--- a/app/assets/stylesheets/common/base/cat_reorder.scss
+++ b/app/assets/stylesheets/common/base/cat_reorder.scss
@@ -10,9 +10,12 @@
       width: 2em;
     }
   }
+  #rc-scroll-anchor {
+    padding: 0;
+  }
   table {
-    width: 100%;
     padding-bottom: 150px;
+    margin: 0 0.667em;
     td {
       padding: 0.5em 0.5em 0.5em 0;
       @include breakpoint(mobile, min-width) {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 22e29f11909..5d83d6fda5a 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -191,9 +191,6 @@
   }
 
   .modal-body {
-    position: relative;
-    box-sizing: border-box;
-    width: 100%;
     overflow-y: auto;
     max-height: 400px;
 
@@ -248,8 +245,9 @@
       }
     }
     textarea {
-      width: 99%;
+      width: 100%;
       height: 80px;
+      box-sizing: border-box;
     }
     p {
       font-size: $font-0;
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 6985f94ad6c..52220a8d037 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -68,16 +68,16 @@
 }
 
 .modal-body.feature-topic {
-  padding: 5px;
   max-height: 500px;
   input.date-picker {
     margin: 0;
   }
-  hr {
-    margin: 10px 0;
-  }
   .feature-section {
     display: block;
+    padding: 1em 0.667em;
+    &:not(:last-of-type) {
+      border-bottom: 1px solid $primary-low;
+    }
     .badge-wrapper {
       margin-right: 0;
     }
@@ -96,6 +96,10 @@
       position: relative;
     }
   }
+
+  .d-modal-cancel {
+    margin-left: 0;
+  }
 }
 
 .desktop-view .feature-topic-modal {
@@ -118,7 +122,7 @@
     display: block;
     clear: both;
     max-width: 90%;
-    margin: 0 10px;
+    margin: 0;
   }
 }
 
diff --git a/app/assets/stylesheets/common/components/share-and-invite-modal.scss b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
index c5177006f90..75fe9c9032f 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -2,6 +2,7 @@
   .modal-body {
     max-width: 475px;
     min-width: 320px;
+    padding: 0;
   }
 
   .modal-header {
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 33f4efc19bb..51894953915 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -23,7 +23,10 @@
   top: 50%;
 }
 .modal-body {
-  padding: 10px;
+  > * {
+    box-sizing: border-box;
+    padding: 0.667em;
+  }
 }
 
 // we need a little extra room on mobile for the
@@ -46,6 +49,7 @@
 #choosing-topic {
   p {
     margin-top: 0;
+    padding-bottom: 0;
   }
 
   input[type="radio"] {
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
index 66593514d73..0c123261482 100644
--- a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -62,6 +62,7 @@
 }
 
 .discourse-local-dates-create-modal {
+  box-sizing: border-box;
   min-height: 320px;
   display: flex;
   flex-direction: row;