Commit 6178c500 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch '28410-dropdown-styling' into 'master'

Resolve "missing count badge styling in new sidebar dropdown"

Closes #28410

See merge request !9592
parents 12592ac7 d6c388da
...@@ -193,6 +193,10 @@ ...@@ -193,6 +193,10 @@
&.is-focused { &.is-focused {
background-color: $dropdown-link-hover-bg; background-color: $dropdown-link-hover-bg;
text-decoration: none; text-decoration: none;
.badge {
background-color: darken($row-hover, 5%);
}
} }
&.dropdown-menu-empty-link { &.dropdown-menu-empty-link {
...@@ -229,6 +233,12 @@ ...@@ -229,6 +233,12 @@
padding: 5px 8px; padding: 5px 8px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
.badge {
position: absolute;
right: 8px;
top: 5px;
}
} }
.dropdown-menu-drop-up { .dropdown-menu-drop-up {
......
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
%span %span
Issues Issues
(#{number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))}) .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))
= nav_link(path: 'dashboard#merge_requests') do = nav_link(path: 'dashboard#merge_requests') do
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
%span %span
Merge Requests Merge Requests
(#{number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))}) .badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))
= nav_link(controller: 'dashboard/snippets') do = nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, title: 'Snippets' do = link_to dashboard_snippets_path, title: 'Snippets' do
%span %span
......
---
title: Add badges to global dropdown
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment