Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
df1ebe98
Commit
df1ebe98
authored
Apr 16, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix navbar
parent
abae0911
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-0
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+1
-0
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+6
-6
No files found.
app/assets/stylesheets/framework/header.scss
View file @
df1ebe98
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
}
}
.header-content
{
.header-content
{
width
:
100%
;
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
...
...
app/assets/stylesheets/pages/search.scss
View file @
df1ebe98
...
@@ -47,6 +47,7 @@ input[type="checkbox"]:hover {
...
@@ -47,6 +47,7 @@ input[type="checkbox"]:hover {
}
}
.location-badge
{
.location-badge
{
white-space
:
nowrap
;
height
:
32px
;
height
:
32px
;
font-size
:
12px
;
font-size
:
12px
;
margin
:
-4px
4px
-4px
-4px
;
margin
:
-4px
4px
-4px
-4px
;
...
...
app/views/layouts/header/_default.html.haml
View file @
df1ebe98
%header
.navbar.navbar-gitlab.qa-navbar
%header
.navbar.navbar-gitlab.qa-navbar
.navbar-expand-sm
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
.container-fluid
.container-fluid
.header-content
.header-content
...
@@ -24,25 +24,25 @@
...
@@ -24,25 +24,25 @@
%li
.nav-item.d-none.d-sm-none.d-md-block
%li
.nav-item.d-none.d-sm-none.d-md-block
=
render
'layouts/search'
unless
current_controller?
(
:search
)
=
render
'layouts/search'
unless
current_controller?
(
:search
)
%li
.nav-item.d-inline-block.d-sm-none.d-md-none
%li
.nav-item.d-inline-block.d-sm-none.d-md-none
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
,
class:
'nav-link'
}
do
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'search'
,
size:
16
)
=
sprite_icon
(
'search'
,
size:
16
)
-
if
header_link?
(
:issues
)
-
if
header_link?
(
:issues
)
=
nav_link
(
path:
'dashboard#issues'
,
html_options:
{
class:
"
nav-link
user-counter"
})
do
=
nav_link
(
path:
'dashboard#issues'
,
html_options:
{
class:
"user-counter"
})
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'issues'
,
size:
16
)
=
sprite_icon
(
'issues'
,
size:
16
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
-
issues_count
=
assigned_issuables_count
(
:issues
)
%span
.badge.badge-pill.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
%span
.badge.badge-pill.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
=
number_with_delimiter
(
issues_count
)
-
if
header_link?
(
:merge_requests
)
-
if
header_link?
(
:merge_requests
)
=
nav_link
(
path:
'dashboard#merge_requests'
,
html_options:
{
class:
"
nav-link
user-counter"
})
do
=
nav_link
(
path:
'dashboard#merge_requests'
,
html_options:
{
class:
"user-counter"
})
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
class:
'dashboard-shortcuts-merge_requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
class:
'dashboard-shortcuts-merge_requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'git-merge'
,
size:
16
)
=
sprite_icon
(
'git-merge'
,
size:
16
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
-
merge_requests_count
=
assigned_issuables_count
(
:merge_requests
)
%span
.badge.badge-pill.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
%span
.badge.badge-pill.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
=
number_with_delimiter
(
merge_requests_count
)
=
number_with_delimiter
(
merge_requests_count
)
-
if
header_link?
(
:todos
)
-
if
header_link?
(
:todos
)
=
nav_link
(
controller:
'dashboard/todos'
,
html_options:
{
class:
"
nav-link
user-counter"
})
do
=
nav_link
(
controller:
'dashboard/todos'
,
html_options:
{
class:
"user-counter"
})
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
class:
'shortcuts-todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
class:
'shortcuts-todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'todo-done'
,
size:
16
)
=
sprite_icon
(
'todo-done'
,
size:
16
)
%span
.badge.badge-pill.todos-count
{
class:
(
'hidden'
if
todos_pending_count
.
zero?
)
}
%span
.badge.badge-pill.todos-count
{
class:
(
'hidden'
if
todos_pending_count
.
zero?
)
}
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
-
if
header_link?
(
:user_dropdown
)
-
if
header_link?
(
:user_dropdown
)
%li
.nav-item.header-user.dropdown
%li
.nav-item.header-user.dropdown
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"
nav-link
header-user-avatar qa-user-avatar"
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"header-user-avatar qa-user-avatar"
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-align-right
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%ul
...
...
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