Resolve "missing count badge styling in new sidebar dropdown"
This commit is contained in:
parent
12592ac7f4
commit
d6c388da6b
|
@ -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 @@
|
||||||
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 @@
|
||||||
= 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
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Add badges to global dropdown
|
||||||
|
merge_request:
|
||||||
|
author:
|
Loading…
Reference in New Issue