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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8bd5bf10
Commit
8bd5bf10
authored
Sep 29, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update nav icons to chevron-down
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43767
parent
ef885cd1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-2
app/views/layouts/header/_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+3
-3
changelogs/unreleased/258668-update-icons-in-nav.yml
changelogs/unreleased/258668-update-icons-in-nav.yml
+5
-0
ee/app/views/dashboard/_nav_link.html.haml
ee/app/views/dashboard/_nav_link.html.haml
+1
-1
No files found.
app/views/layouts/header/_default.html.haml
View file @
8bd5bf10
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
%span
.gl-sr-only
%span
.gl-sr-only
=
s_
(
'Nav|Help'
)
=
s_
(
'Nav|Help'
)
=
sprite_icon
(
'question'
)
=
sprite_icon
(
'question'
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
=
render
'layouts/header/help_dropdown'
=
render
'layouts/header/help_dropdown'
-
if
header_link?
(
:user_dropdown
)
-
if
header_link?
(
:user_dropdown
)
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
=
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:
"header-user-avatar qa-user-avatar"
,
alt:
current_user
.
name
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"header-user-avatar qa-user-avatar"
,
alt:
current_user
.
name
=
render_if_exists
'layouts/header/user_notification_dot'
,
project:
project
,
namespace:
group
=
render_if_exists
'layouts/header/user_notification_dot'
,
project:
project
,
namespace:
group
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
=
render
'layouts/header/current_user_dropdown'
=
render
'layouts/header/current_user_dropdown'
-
if
has_impersonation_link
-
if
has_impersonation_link
...
...
app/views/layouts/header/_new_dropdown.haml
View file @
8bd5bf10
%li
.header-new.dropdown
{
data:
{
track_label:
"new_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
}
%li
.header-new.dropdown
{
data:
{
track_label:
"new_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
}
=
link_to
new_project_path
,
class:
"header-new-dropdown-toggle has-tooltip qa-new-menu-toggle"
,
id:
"js-onboarding-new-project-link"
,
title:
_
(
"New..."
),
ref:
'tooltip'
,
aria:
{
label:
_
(
"New..."
)
},
data:
{
toggle:
'dropdown'
,
placement:
'bottom'
,
container:
'body'
,
display:
'static'
}
do
=
link_to
new_project_path
,
class:
"header-new-dropdown-toggle has-tooltip qa-new-menu-toggle"
,
id:
"js-onboarding-new-project-link"
,
title:
_
(
"New..."
),
ref:
'tooltip'
,
aria:
{
label:
_
(
"New..."
)
},
data:
{
toggle:
'dropdown'
,
placement:
'bottom'
,
container:
'body'
,
display:
'static'
}
do
=
sprite_icon
(
'plus-square'
)
=
sprite_icon
(
'plus-square'
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
%ul
%ul
-
if
@group
&
.
persisted?
-
if
@group
&
.
persisted?
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
8bd5bf10
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
id:
'nav-projects-dropdown'
,
class:
"home dropdown header-projects qa-projects-dropdown"
,
data:
{
track_label:
"projects_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
})
do
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
id:
'nav-projects-dropdown'
,
class:
"home dropdown header-projects qa-projects-dropdown"
,
data:
{
track_label:
"projects_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
})
do
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
=
_
(
'Projects'
)
=
_
(
'Projects'
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu.frequent-items-dropdown-menu
.dropdown-menu.frequent-items-dropdown-menu
=
render
"layouts/nav/projects_dropdown/show"
=
render
"layouts/nav/projects_dropdown/show"
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
id:
'nav-groups-dropdown'
,
class:
"d-none d-md-block home dropdown header-groups qa-groups-dropdown"
,
data:
{
track_label:
"groups_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
})
do
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
id:
'nav-groups-dropdown'
,
class:
"d-none d-md-block home dropdown header-groups qa-groups-dropdown"
,
data:
{
track_label:
"groups_dropdown"
,
track_event:
"click_dropdown"
,
track_value:
""
}
})
do
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
=
_
(
'Groups'
)
=
_
(
'Groups'
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu.frequent-items-dropdown-menu
.dropdown-menu.frequent-items-dropdown-menu
=
render
"layouts/nav/groups_dropdown/show"
=
render
"layouts/nav/groups_dropdown/show"
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
%li
.header-more.dropdown
{
**
tracking_attrs
(
'main_navigation'
,
'click_more_link'
,
'navigation'
)
}
%li
.header-more.dropdown
{
**
tracking_attrs
(
'main_navigation'
,
'click_more_link'
,
'navigation'
)
}
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
,
qa_selector:
'more_dropdown'
}
}
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
,
qa_selector:
'more_dropdown'
}
}
=
_
(
'More'
)
=
_
(
'More'
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu
.dropdown-menu
%ul
%ul
-
if
dashboard_nav_link?
(
:groups
)
-
if
dashboard_nav_link?
(
:groups
)
...
...
changelogs/unreleased/258668-update-icons-in-nav.yml
0 → 100644
View file @
8bd5bf10
---
title
:
Update nav icons to chevron-down
merge_request
:
43767
author
:
type
:
changed
ee/app/views/dashboard/_nav_link.html.haml
View file @
8bd5bf10
-
if
any_dashboard_nav_link?
([
:environments
,
:operations
,
:security
])
-
if
any_dashboard_nav_link?
([
:environments
,
:operations
,
:security
])
%button
#js-dashboards-menu
.btn-link
{
type:
'button'
,
data:
{
toggle:
'dropdown'
},
'aria-label'
:
_
(
'Dashboards'
),
'aria-haspopup'
:
true
,
'aria-expanded'
:
false
}
%button
#js-dashboards-menu
.btn-link
{
type:
'button'
,
data:
{
toggle:
'dropdown'
},
'aria-label'
:
_
(
'Dashboards'
),
'aria-haspopup'
:
true
,
'aria-expanded'
:
false
}
=
sprite_icon
(
'dashboard'
,
size:
18
)
=
sprite_icon
(
'dashboard'
,
size:
18
)
=
sprite_icon
(
'
angle
-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'
chevron
-down'
,
css_class:
'caret-down'
)
.dropdown-menu
{
'aria-labelledby'
:
"js-dashboards-menu"
}
.dropdown-menu
{
'aria-labelledby'
:
"js-dashboards-menu"
}
.dropdown-bold-header
.dropdown-bold-header
=
_
(
'Dashboards'
)
=
_
(
'Dashboards'
)
...
...
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