Commit 57570877 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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? 😃

See merge request !1199
parents 7140e800 4a4d9fe1
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased) 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) - 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) - 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) - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
} }
} }
.project-home-dropdown {
margin: 11px 3px 0;
}
.project-home-desc { .project-home-desc {
h1 { h1 {
margin: 0; margin: 0;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%span.dropdown %span.dropdown
%a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
= icon('plus') = icon('plus')
%ul.dropdown-menu %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
- if can?(current_user, :create_issue, @project) - if can?(current_user, :create_issue, @project)
%li %li
= link_to url_for_new_issue do = link_to url_for_new_issue do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment