summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-10 22:05:55 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-10 22:05:55 +0000
commit8cec2f4beb7ea3e3442b053589d9702847339f84 (patch)
treeb3cc21570d7e4b25a6022e6c70d7fcf7b4e47c54
parent0e0984952b458a617cf1f95de8b8fb88ed014d6a (diff)
parent15433bc5d6a93e55f143dcb34dc3a807f6d4f02b (diff)
downloadgitlab-ce-8cec2f4beb7ea3e3442b053589d9702847339f84.tar.gz
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
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/issues/show.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_title.html.haml2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e2480b66ae4..dc06303aecf 100644
--- 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
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index e8c673d48bd..09347ad5fff 100644
--- 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)
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 9f2a0f5d99a..e7c5bca6a37 100644
--- 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) }