kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve "missing count badge styling in new sidebar dropdown"

This commit is contained in:
Annabel Dunstone Gray 2017-03-02 21:34:42 +00:00 committed by Alfredo Sumaran
parent 12592ac7f4
commit d6c388da6b
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/framework/dropdowns.scss
View File

@ -193,6 +193,10 @@
&.is-focused {
background-color: $dropdown-link-hover-bg;
text-decoration: none;
.badge {
background-color: darken($row-hover, 5%);
}
}
&.dropdown-menu-empty-link {
@ -229,6 +233,12 @@
padding: 5px 8px;
color: $gl-text-color-secondary;
}
.badge {
position: absolute;
right: 8px;
top: 5px;
}
}
.dropdown-menu-drop-up {

4
app/views/layouts/nav/_dashboard.html.haml
View File

@ -24,12 +24,12 @@
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
%span
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
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
%span
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
= link_to dashboard_snippets_path, title: 'Snippets' do
%span

4
changelogs/unreleased/28410-dropdown-styling.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Add badges to global dropdown
merge_request:
author: