Merge branch 'fix-options-caret-mobile-viewport' into 'master'

Fix inconsistent options dropdown caret on mobile viewports ## What does this MR do? Change the options dropdown caret from left aligned to right aligned (only visible on mobile viewports) ## Are there points in the code the reviewer needs to double check? Check if there are any other dropdowns that have left aligned carets ## Why was this MR needed? Resolve UI inconsistency as some dropdown carets were already right aligned ## Screenshots (if relevant) Before: ![Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM](/uploads/767d9344db4973af5a5368d5149144cc/Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM.png) After: ![Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM](/uploads/882614cb9c5f85bf44e118cd7c74fcef/Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #22086 See merge request !6372

Merge branch 'fix-options-caret-mobile-viewport' into 'master'
8cec2f4b · Fatih Acet · 0e098495 · 15433bc5 · 8cec2f4b · 8cec2f4b
Commit 8cec2f4b authored Oct 10, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

show.html.haml app/views/projects/issues/show.html.haml +1 -1

_mr_title.html.haml app/views/projects/merge_requests/show/_mr_title.html.haml +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.13.0 (unreleased)
  - Replaced the check sign to arrow in the show build view. !6501
  - Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar)
  - Speed-up group milestones show page
+  - Fix inconsistent options dropdown caret on mobile viewports (ClemMakesApps)
  - Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs)
  - Add tag shortcut from the Commit page. !6543
  - Keep refs for each deployment

--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -23,8 +23,8 @@
    .issuable-actions
      .clearfix.issue-btn-group.dropdown
        %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
-          = icon('caret-down')
          Options
+          = icon('caret-down')
        .dropdown-menu.dropdown-menu-align-right.hidden-lg
          %ul
            - if can?(current_user, :create_issue, @project)

--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -19,8 +19,8 @@
    .issuable-actions
      .clearfix.issue-btn-group.dropdown
        %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
-          = icon('caret-down')
          Options
+          = icon('caret-down')
        .dropdown-menu.dropdown-menu-align-right.hidden-lg
          %ul
            %li{ class: merge_request_button_visibility(@merge_request, true) }