Merge branch 'UI-improvements-for-count-badges-and-permission-badges' into 'master'

Ui improvements for count badges and permission badges

See merge request !11805
This commit is contained in:
Annabel Dunstone Gray 2017-05-31 15:04:01 +00:00
commit 2281589c5b
3 changed files with 9 additions and 4 deletions

View file

@ -293,7 +293,7 @@ $btn-white-active: #848484;
/*
* Badges
*/
$badge-bg: #eee;
$badge-bg: rgba(0, 0, 0, 0.07);
$badge-color: $gl-text-color-secondary;
/*

View file

@ -550,13 +550,13 @@ ul.notes {
position: relative;
top: -2px;
display: inline-block;
padding-left: 4px;
padding-right: 4px;
padding-left: 7px;
padding-right: 7px;
color: $notes-role-color;
font-size: 12px;
line-height: 20px;
border: 1px solid $border-color;
border-radius: $border-radius-base;
border-radius: $label-border-radius;
}

View file

@ -0,0 +1,5 @@
---
title: Count badges depend on translucent color to better adjust to different background
colors and permission badges now feature a pill shaped design similar to labels
merge_request:
author: