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

Merge branch 'revert-discussion-counter-height' into 'master' 

Revert discussion counter height

Closes #45896

See merge request gitlab-org/gitlab-ce!18656
This commit is contained in:
Filipa Lacerda 2018-04-30 23:42:22 +00:00
parent c34061db96 4c5829d7ac
commit 8b3db0d64b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/notes/components/discussion_counter.vue
View File

@ -86,7 +86,7 @@ export default {
v-html="resolveSvg"
></span>
</span>
<span class=".line-resolve-text">
<span class="line-resolve-text">
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ countText }} resolved
</span>
</div>

4
app/assets/stylesheets/pages/notes.scss
View File

@ -772,7 +772,3 @@ ul.notes {
height: auto;
}
}
.line-resolve-text {
vertical-align: middle;
}

5
changelogs/unreleased/revert-discussion-counter-height.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Revert discussion counter height
merge_request: 18656
author: George Tsiolis
type: changed