diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-21 14:02:40 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-21 14:02:40 +0000 |
| commit | 0e54c4402538f56d43317d23efbfc1c361ae21f1 (patch) | |
| tree | d1a9c01fb3d5af252f10a1e04f59e52326ec44a7 | |
| parent | 134df14c1c327a53668eb5b6c1ece9fb33a00caa (diff) | |
| parent | 67b0aa5c4dee01a0a82c8a64f07473b0e32c2423 (diff) | |
| download | gitlab-ce-0e54c4402538f56d43317d23efbfc1c361ae21f1.tar.gz | |
Merge branch '59117-inconsistent-hover-behavior-on-navbar-items' into 'master'
Resolve "Inconsistent hover behavior on navbar items"
Closes #59117
See merge request gitlab-org/gitlab-ce!26345
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index f5ed6621c55..1e025b3a67d 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -304,7 +304,9 @@ } } -.caret-down { +.caret-down, +.btn .caret-down { + top: 0; height: 11px; width: 11px; margin-left: 4px; diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 1ec368f8910..5a27237bf76 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -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 diff --git a/changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml b/changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml new file mode 100644 index 00000000000..eb9dcef4a89 --- /dev/null +++ b/changelogs/unreleased/59117-inconsistent-hover-behavior-on-navbar-items.yml @@ -0,0 +1,5 @@ +--- +title: Fix hover animation consistency in top navbar items +merge_request: 26345 +author: +type: fixed |