diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-05-29 10:24:53 +0200 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-07 11:10:24 +0200 |
commit | 6709e65cfc9fcfbe90427645cd1cf679a28ebddd (patch) | |
tree | 0661974c4deb35331a04fd6fe6f3ddf136cd9981 /app | |
parent | 5677cb0114de78559bb626aa3b0bb456271429df (diff) | |
download | gitlab-ce-6709e65cfc9fcfbe90427645cd1cf679a28ebddd.tar.gz |
Externalised Dropdown
Checks for creating new issue
Styling of .dropdown-bold-header
Fixed Spinach Tests to limit them to the main content area for clicking 'New Project' etc. so that they don't click the dropdown menu
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 8 | ||||
-rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 55 |
2 files changed, 36 insertions, 27 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 5ab48b6c874..9613006d021 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -261,7 +261,13 @@ text-transform: capitalize; } - .separator + .dropdown-header { + .dropdown-bold-header { + font-weight: 600; + line-height: 22px; + padding: 0 16px; + } + + .separator + .dropdown-header, .separator + .dropdown-bold-header { padding-top: 2px; } diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index 931c02b7268..e9d45802bac 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -3,35 +3,38 @@ = icon('plus fw') = icon('caret-down') .dropdown-menu-nav.dropdown-menu-align-right - %ul - - create_group_project = can?(current_user, :create_projects, @group) - - create_group_subgroup = can?(current_user, :create_subgroup, @group) - - if @group && (create_group_project || create_group_subgroup) - %li - .bold This group - - if create_group_project - %li - = link_to 'New project', new_project_path(namespace_id: @group.id) - - if create_group_subgroup - %li - = link_to 'New subgroup', new_group_path(parent_id: @group.id) + %ul + - if @group + - create_group_project = can?(current_user, :create_projects, @group) + - create_group_subgroup = can?(current_user, :create_subgroup, @group) + - if (create_group_project || create_group_subgroup) + %li.dropdown-bold-header This group + - if create_group_project + %li + = link_to 'New project', new_project_path(namespace_id: @group.id) + - if create_group_subgroup + %li + = link_to 'New subgroup', new_group_path(parent_id: @group.id) + %li.divider + %li.dropdown-bold-header GitLab - if @project - %li - .bold This project - %li - = link_to 'New issue', new_namespace_project_issue_path(@project.namespace, @project) + - create_project_issue = can?(current_user, :create_issue, @project) - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project)) - - if merge_project - %li - = link_to 'New merge request', new_namespace_project_merge_request_path(merge_project.namespace, merge_project) - - if can?(current_user, :create_project_snippet, @project) - %li - = link_to 'New snippet', new_namespace_project_snippet_path(@project.namespace, @project) - - if @group || @project - %li.divider - %li - .bold GitLab + - create_project_snippet = can?(current_user, :create_project_snippet, @project) + - if (create_project_issue || create_project_mr || create_project_snippet) + %li.dropdown-bold-header This project + - if create_project_issue + %li + = link_to 'New issue', new_namespace_project_issue_path(@project.namespace, @project) + - if merge_project + %li + = link_to 'New merge request', new_namespace_project_merge_request_path(merge_project.namespace, merge_project) + - if create_project_snippet + %li + = link_to 'New snippet', new_namespace_project_snippet_path(@project.namespace, @project) + %li.divider + %li.dropdown-bold-header GitLab - if current_user.can_create_project? %li = link_to 'New project', new_project_path |