summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 17:35:28 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 17:35:28 +0000
commit575708776145f84107667d4880cc893d3e88ebd3 (patch)
treeaa4da9a526c39579011a81e77881e011bb1cdcca
parent7140e800ee701a8d4b117590107f26ca23ce0e60 (diff)
parent4a4d9fe16e371c4c5d4423a285758abe1d04d84d (diff)
downloadgitlab-ce-575708776145f84107667d4880cc893d3e88ebd3.tar.gz
Merge branch 'dropdown-positioning' into 'master'
UI Improvement for the project page This MR improves the positioning of the dropdown menu on the project page. I've added the WIP because I didn't check if this can cause any tests to break. I'll remove it once the CI is green. Before: ![gitlab_dropdown_old](https://gitlab.com/haynes/gitlab-ce/uploads/ac30810abe9e75154edd2a896c9a4947/gitlab_dropdown_old.png) After: ![gitlab_dropdown_new](https://gitlab.com/haynes/gitlab-ce/uploads/616c237fe26934ebbbc82f0ce73e72da/gitlab_dropdown_new.png) This is the MR for the discussion in gitlab-org/gitlab-ce!971 . /cc @dzaporozhets Can you review it please? :smiley: See merge request !1199
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/projects.scss4
-rw-r--r--app/views/projects/buttons/_dropdown.html.haml2
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5222ab1e3e1..a93558fb10d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased)
+ - Improve dropdown positioning on the project home page (Hannes Rosenögger)
- Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode (Stan Hu)
- Fix "Reload with full diff" URL button in compare branch view (Stan Hu)
- Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 1e138651d52..33ebaae34ad 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -30,6 +30,10 @@
}
}
+ .project-home-dropdown {
+ margin: 11px 3px 0;
+ }
+
.project-home-desc {
h1 {
margin: 0;
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index cade930c8cc..bc7625e8989 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -2,7 +2,7 @@
%span.dropdown
%a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
= icon('plus')
- %ul.dropdown-menu
+ %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
- if can?(current_user, :create_issue, @project)
%li
= link_to url_for_new_issue do