From bea9594e0e244992a2e545792a190ce1a49afe3d Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Tue, 28 May 2019 18:34:06 -0500
Subject: [PATCH] Fix MR checkboxes alignment on mobile

It does this by removing the `.accept-control` class which
was only causing problems.
---
 .../components/states/squash_before_merge.vue |  4 +-
 .../stylesheets/pages/merge_requests.scss     | 46 -------------------
 ...037-fix-mr-checkboxes-mobile-alignment.yml |  5 ++
 3 files changed, 7 insertions(+), 48 deletions(-)
 create mode 100644 changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
index b1f5655a15a..accb9d9fef1 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
@@ -29,8 +29,8 @@ export default {
 </script>
 
 <template>
-  <div class="accept-control inline">
-    <label class="merge-param-checkbox">
+  <div class="inline">
+    <label>
       <input
         :checked="value"
         :disabled="isDisabled"
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index ab5a9e170f0..77b40fe2d30 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -185,46 +185,6 @@
         }
       }
     }
-
-    .accept-control {
-      display: inline-block;
-      float: left;
-      margin: 0;
-      margin-left: 20px;
-      padding: 5px;
-      padding-top: 8px;
-      line-height: 20px;
-
-      &.right {
-        float: right;
-        padding-right: 0;
-      }
-
-      .modify-merge-commit-link {
-        padding: 0;
-        background-color: transparent;
-        border: 0;
-        color: $gl-text-color;
-
-        &:hover,
-        &:focus {
-          text-decoration: underline;
-        }
-      }
-
-      .merge-param-checkbox {
-        margin: 0;
-      }
-
-      a .fa-question-circle {
-        color: $gl-text-color-secondary;
-
-        &:hover,
-        &:focus {
-          color: $link-hover-color;
-        }
-      }
-    }
   }
 
   .ci-widget {
@@ -407,12 +367,6 @@
         width: 100%;
         text-align: center;
       }
-
-      .accept-control {
-        width: 100%;
-        text-align: center;
-        margin: 0;
-      }
     }
 
     .commit-message-editor {
diff --git a/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml b/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml
new file mode 100644
index 00000000000..a2de6cd6d45
--- /dev/null
+++ b/changelogs/unreleased/57037-fix-mr-checkboxes-mobile-alignment.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Merge Request merge checkbox alignment on mobile view
+merge_request: 28845
+author:
+type: fixed