BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0a094cb1
Commit
0a094cb1
authored
Feb 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
header.scss
app/assets/stylesheets/framework/header.scss
+9
-0
projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
project_title.html.haml
spec/javascripts/fixtures/project_title.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/header.scss
View file @
0a094cb1
...
...
@@ -91,8 +91,17 @@ header {
.dropdown-toggle-caret
{
position
:
relative
;
top
:
-2px
;
width
:
12px
;
line-height
:
12px
;
margin-left
:
5px
;
font-size
:
10px
;
text-align
:
center
;
cursor
:
pointer
;
}
.project-item-select
{
right
:
auto
;
left
:
0
;
}
}
...
...
app/helpers/projects_helper.rb
View file @
0a094cb1
...
...
@@ -59,9 +59,8 @@ module ProjectsHelper
link_to
(
simple_sanitize
(
owner
.
name
),
user_path
(
owner
))
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
+=
content_tag
:span
,
nil
,
{
class:
"fa fa-chevron-down dropdown-toggle-caret"
}
if
current_user
if
current_user
link_output
+=
project_select_tag
:project_path
,
...
...
@@ -71,6 +70,7 @@ module ProjectsHelper
link_output
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
+=
' · '
.
html_safe
+
link_to
(
simple_sanitize
(
name
),
url
)
if
name
...
...
spec/javascripts/fixtures/project_title.html.haml
View file @
0a094cb1
%h1
.title
%a
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
%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"
}
%span
.fa.fa-chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment