diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-10 13:12:04 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-10 13:12:04 +0000 |
| commit | 07f8f2056d7143c770d420ec3345781802047810 (patch) | |
| tree | 167c5a15a27eb37da1d02350aa518abd32895f69 | |
| parent | 6c81c81a6f50bee3d62d2aeeb9e1132ca35d7158 (diff) | |
| parent | fa98280b37511d2de53054f4108dbcf05d3caa89 (diff) | |
| download | gitlab-ce-07f8f2056d7143c770d420ec3345781802047810.tar.gz | |
Merge branch 'avatar-mixin' into 'master'
Fix border radius of collapse discussion btn
See merge request gitlab-org/gitlab-ce!29217
| -rw-r--r-- | app/assets/stylesheets/components/avatar.scss | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 11 | ||||
| -rw-r--r-- | 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 { |