Commit ff1adfa4 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '225965-move-counter-on-related-merge-requests-issues-into-a-badge' into 'master'

Remove border from related merge requests/issues counter

Closes #225965

See merge request gitlab-org/gitlab!36272
parents f67e67f8 f59b19b6
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
{{ __('Related merge requests') }} {{ __('Related merge requests') }}
</span> </span>
<div v-if="totalCount" class="d-inline-flex lh-100 align-middle"> <div v-if="totalCount" class="d-inline-flex lh-100 align-middle">
<div class="mr-count-badge border-width-1px border-style-solid border-color-default"> <div class="mr-count-badge gl-display-inline-flex">
<div class="mr-count-badge-count"> <div class="mr-count-badge-count">
<svg class="s16 mr-1 text-secondary"> <svg class="s16 mr-1 text-secondary">
<icon name="merge-request" class="mr-1 text-secondary" /> <icon name="merge-request" class="mr-1 text-secondary" />
......
.issue-count-badge, .issue-count-badge,
.mr-count-badge { .mr-count-badge {
display: inline-flex;
border-radius: $border-radius-base;
padding: 5px $gl-padding-8; padding: 5px $gl-padding-8;
} }
......
---
title: Remove border from related merge requests/issues counter
merge_request: 36272
author:
type: fixed
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
</a> </a>
<div class="d-inline-flex lh-100 align-middle"> <div class="d-inline-flex lh-100 align-middle">
<div <div
class="js-related-issues-header-issue-count related-issues-header-issue-count issue-count-badge mx-1 border-width-1px border-style-solid border-color-default" class="js-related-issues-header-issue-count related-issues-header-issue-count issue-count-badge gl-display-inline-flex gl-mx-2"
> >
<span class="issue-count-badge-count"> <span class="issue-count-badge-count">
<icon :name="issuableTypeIcon" class="mr-1 text-secondary" /> <icon :name="issuableTypeIcon" class="mr-1 text-secondary" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment