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

Merge branch 'avatar-mixin' into 'master' 

Fix border radius of collapse discussion btn

See merge request gitlab-org/gitlab-ce!29217
This commit is contained in:
Kushal Pandya 2019-06-10 13:12:04 +00:00
parent 6c81c81a6f fa98280b37
commit 07f8f2056d
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/components/avatar.scss
View File

@ -191,12 +191,5 @@ $identicon-backgrounds: $identicon-red, $identicon-purple, $identicon-indigo, $i
}
.avatar-counter {
background-color: $gray-darkest;
color: $white-light;
border: 1px solid $gray-normal;
border-radius: 1em;
font-family: $regular-font;
font-size: 9px;
line-height: 16px;
text-align: center;
@include avatar-counter();
}

11
app/assets/stylesheets/framework/mixins.scss
View File

@ -396,3 +396,14 @@
width: $gl-font-size * $code-line-height * 0.9;
height: $gl-font-size * $code-line-height * 0.9;
}
@mixin avatar-counter($border-radius: 1em) {
background-color: $gray-darkest;
color: $white-light;
border: 1px solid $gray-normal;
border-radius: $border-radius;
font-family: $regular-font;
font-size: 9px;
line-height: 16px;
text-align: center;
}

2
app/assets/stylesheets/pages/diff.scss
View File

@ -676,7 +676,7 @@ table.code {
.diff-comments-more-count,
.diff-notes-collapse {
@extend .avatar-counter;
@include avatar-counter(50%);
}
.diff-notes-collapse {