Merge branch 'fix-merge-on-success-widget-buttons' into 'master'

Fixed merge on success widget buttons on mobile ## What does this MR do? Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button. ## Are there points in the code the reviewer needs to double check? Ney ## Why was this MR needed? mobile UX ## What are the relevant issue numbers? Closes #18610. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_03.09.36](/uploads/b662e1b7ad683cd89f1233a859caccb2/Screen_Shot_2016-06-17_at_03.09.36.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4726

Merge branch 'fix-merge-on-success-widget-buttons' into 'master'
0f22a3a2 · Jacob Schatz · b635980d · c252b52d · 0f22a3a2
Commit 0f22a3a2 authored Jun 20, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +12 -3

No files found.
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -119,7 +119,12 @@
      margin-bottom: 0;
    }
-    @media (max-width: $screen-sm-max) {
+    .btn-grouped {
+      margin-left: 0;
+      margin-right: 7px;
+    }
+    @media (max-width: $screen-xs-max) {
      h4 {
        font-size: 15px;
      }
@@ -131,10 +136,14 @@
      .btn,
      .btn-group,
      .accept-action {
-        width: 100%;
        margin-bottom: 4px;
      }
+      .accept-action {
+        width: 100%;
+        text-align: center;
+      }
      .accept-control {
        width: 100%;
        text-align: center;
@@ -284,7 +293,7 @@
    margin-bottom: 0;
  }
-  @media (min-width: $screen-sm-min) {
+  @media (min-width: $screen-xs-min) {
    float: left;
    width: 50%;
    margin-bottom: 0;