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

Added lighter count badge background-color for on white backgrounds

Browse source
This commit is contained in:
Dimitrie Hoekstra 2016-12-01 13:32:05 +01:00
parent 507abdb773
commit 3c2cb28e84
7 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/framework/nav.scss
View file

@ -75,10 +75,14 @@
.badge {
font-weight: normal;
background-color: #eee;
background-color: #f3f3f3;
color: $btn-transparent-color;
vertical-align: baseline;
}
.badge-dark {
background-color: #eee;
}
}
&.sub-nav {

2
app/assets/stylesheets/pages/environments.scss
View file

@ -116,7 +116,7 @@
.badge {
font-weight: normal;
background-color: $gray-darker;
background-color: #f3f3f3;
color: $gl-placeholder-color;
vertical-align: baseline;
}

2
app/assets/stylesheets/pages/pipelines.scss
View file

@ -507,7 +507,7 @@
}
.badge {
background-color: $gray-darker;
background-color: #f3f3f3;
color: $gl-text-color-light;
font-weight: normal;
margin-left: $btn-xs-side-margin;

2
app/views/layouts/nav/_admin.html.haml
View file

@ -31,7 +31,7 @@
= link_to admin_abuse_reports_path, title: "Abuse Reports" do
%span
Abuse Reports
%span.badge.count= number_with_delimiter(AbuseReport.count(:all))
%span.badge.badge-dark.count= number_with_delimiter(AbuseReport.count(:all))
- if askimet_enabled?
= nav_link(controller: :spam_logs) do

4
app/views/layouts/nav/_group.html.haml
View file

@ -26,13 +26,13 @@
%span
Issues
- issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
%span.badge.count= number_with_delimiter(issues.count)
%span.badge.badge-dark.count= number_with_delimiter(issues.count)
= nav_link(path: 'groups#merge_requests') do
= link_to merge_requests_group_path(@group), title: 'Merge Requests' do
%span
Merge Requests
- merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
%span.badge.count= number_with_delimiter(merge_requests.count)
%span.badge.badge-dark.count= number_with_delimiter(merge_requests.count)
= nav_link(controller: [:group_members]) do
= link_to group_group_members_path(@group), title: 'Members' do
%span

4
app/views/layouts/nav/_project.html.haml
View file

@ -70,14 +70,14 @@
%span
Issues
- if @project.default_issues_tracker?
%span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
%span.badge.badge-dark.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
- if project_nav_tab? :merge_requests
= nav_link(controller: :merge_requests) do
= link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
%span
Merge Requests
%span.badge.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
%span.badge.badge-dark.count.merge_counter= number_with_delimiter(@project.merge_requests.opened.count)
- if project_nav_tab? :wiki
= nav_link(controller: :wikis) do

4
changelogs/unreleased/badge-color-on-white-bg.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Added lighter count badge background-color for on white backgrounds
merge_request: 7873
author: