From fa98280b37511d2de53054f4108dbcf05d3caa89 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 5 Jun 2019 13:28:10 -0500
Subject: Fix border radius of collapse discussion btn

Turn avatar-counter into a mixin with optional border-radius
---
 app/assets/stylesheets/components/avatar.scss |  9 +--------
 app/assets/stylesheets/framework/mixins.scss  | 11 +++++++++++
 app/assets/stylesheets/pages/diff.scss        |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss
index 1afa5ed90f4..8e9650cdf34 100644
--- a/app/assets/stylesheets/components/avatar.scss
+++ b/app/assets/stylesheets/components/avatar.scss
@@ -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();
 }
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index e7278554e6e..ad5096761cd 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -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;
+}
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 3b0d740def3..4ebf1019456 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -676,7 +676,7 @@ table.code {
 
 .diff-comments-more-count,
 .diff-notes-collapse {
-  @extend .avatar-counter;
+  @include avatar-counter(50%);
 }
 
 .diff-notes-collapse {
-- 
cgit v1.2.3