Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f59b19b6
Commit
f59b19b6
authored
Jul 08, 2020
by
Marcel van Remmerden
Committed by
Enrique Alcántara
Jul 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove border from related merge requests/issues counter
parent
828a1788
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue
...ated_merge_requests/components/related_merge_requests.vue
+1
-1
app/assets/stylesheets/pages/issues/issue_count_badge.scss
app/assets/stylesheets/pages/issues/issue_count_badge.scss
+0
-2
changelogs/unreleased/225965-move-counter-on-related-merge-requests-issues-into-a-badge.yml
...counter-on-related-merge-requests-issues-into-a-badge.yml
+5
-0
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
...cripts/related_issues/components/related_issues_block.vue
+1
-1
No files found.
app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue
View file @
f59b19b6
...
...
@@ -82,7 +82,7 @@ export default {
{{
__
(
'
Related merge requests
'
)
}}
</span>
<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"
>
<svg
class=
"s16 mr-1 text-secondary"
>
<icon
name=
"merge-request"
class=
"mr-1 text-secondary"
/>
...
...
app/assets/stylesheets/pages/issues/issue_count_badge.scss
View file @
f59b19b6
.issue-count-badge
,
.mr-count-badge
{
display
:
inline-flex
;
border-radius
:
$border-radius-base
;
padding
:
5px
$gl-padding-8
;
}
...
...
changelogs/unreleased/225965-move-counter-on-related-merge-requests-issues-into-a-badge.yml
0 → 100644
View file @
f59b19b6
---
title
:
Remove border from related merge requests/issues counter
merge_request
:
36272
author
:
type
:
fixed
ee/app/assets/javascripts/related_issues/components/related_issues_block.vue
View file @
f59b19b6
...
...
@@ -140,7 +140,7 @@ export default {
</a>
<div
class=
"d-inline-flex lh-100 align-middle"
>
<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"
>
<icon
:name=
"issuableTypeIcon"
class=
"mr-1 text-secondary"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment