Commit 0a094cb1 authored by Phil Hughes's avatar Phil Hughes

Changed the project switcher dropdown toggle

Moved the positioning of the dropdown to be more aligned with the title

Closes #13219 and #13214
parent 2e8fe0bd
...@@ -91,8 +91,17 @@ header { ...@@ -91,8 +91,17 @@ header {
.dropdown-toggle-caret { .dropdown-toggle-caret {
position: relative; position: relative;
top: -2px; top: -2px;
width: 12px;
line-height: 12px;
margin-left: 5px; margin-left: 5px;
font-size: 10px; font-size: 10px;
text-align: center;
cursor: pointer;
}
.project-item-select {
right: auto;
left: 0;
} }
} }
......
...@@ -59,9 +59,8 @@ module ProjectsHelper ...@@ -59,9 +59,8 @@ module ProjectsHelper
link_to(simple_sanitize(owner.name), user_path(owner)) link_to(simple_sanitize(owner.name), user_path(owner))
end end
project_link = link_to project_path(project), { class: "project-item-select-holder #{"js-projects-dropdown-toggle" if current_user}" } do project_link = link_to project_path(project), { class: "project-item-select-holder" } do
link_output = simple_sanitize(project.name) link_output = simple_sanitize(project.name)
link_output += content_tag :span, nil, { class: "fa fa-chevron-down dropdown-toggle-caret" } if current_user
if current_user if current_user
link_output += project_select_tag :project_path, link_output += project_select_tag :project_path,
...@@ -71,6 +70,7 @@ module ProjectsHelper ...@@ -71,6 +70,7 @@ module ProjectsHelper
link_output link_output
end end
project_link += content_tag :span, nil, { class: "fa fa-chevron-down dropdown-toggle-caret js-projects-dropdown-toggle" } if current_user
full_title = namespace_link + ' / ' + project_link full_title = namespace_link + ' / ' + project_link
full_title += ' · '.html_safe + link_to(simple_sanitize(name), url) if name full_title += ' · '.html_safe + link_to(simple_sanitize(name), url) if name
......
%h1.title %h1.title
%a %a
GitLab Org GitLab Org
%a.project-item-select-holder.js-projects-dropdown-toggle{href: "/gitlab-org/gitlab-test"} %a.project-item-select-holder{href: "/gitlab-org/gitlab-test"}
GitLab Test GitLab Test
%span.fa.fa-chevron-down.dropdown-toggle-caret
%input#project_path.project-item-select.js-projects-dropdown.ajax-project-select{type: "hidden", name: "project_path", "data-include-groups" => "false"} %input#project_path.project-item-select.js-projects-dropdown.ajax-project-select{type: "hidden", name: "project_path", "data-include-groups" => "false"}
%span.fa.fa-chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
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