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
bbf7a1fd
Commit
bbf7a1fd
authored
Mar 21, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
7eb37baf
0e54c440
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+3
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+2
-2
changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml
...sed/59117-inconsistent-hover-behavior-on-navbar-items.yml
+5
-0
No files found.
app/assets/stylesheets/framework/header.scss
View file @
bbf7a1fd
...
...
@@ -304,7 +304,9 @@
}
}
.caret-down
{
.caret-down
,
.btn
.caret-down
{
top
:
0
;
height
:
11px
;
width
:
11px
;
margin-left
:
4px
;
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
bbf7a1fd
...
...
@@ -3,7 +3,7 @@
%ul
.list-unstyled.navbar-sub-nav
-
if
dashboard_nav_link?
(
:projects
)
=
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"
}
})
do
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
=
_
(
'Projects'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu.frequent-items-dropdown-menu
...
...
@@ -11,7 +11,7 @@
-
if
dashboard_nav_link?
(
:groups
)
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
id:
'nav-groups-dropdown'
,
class:
"home dropdown header-groups qa-groups-dropdown"
,
data:
{
track_label:
"groups_dropdown"
,
track_event:
"click_dropdown"
}
})
do
%button
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn
{
type:
'button'
,
data:
{
toggle:
"dropdown"
}
}
=
_
(
'Groups'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu.frequent-items-dropdown-menu
...
...
changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml
0 → 100644
View file @
bbf7a1fd
---
title
:
Fix hover animation consistency in top navbar items
merge_request
:
26345
author
:
type
:
fixed
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