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

Revert discussion counter height Closes #45896 See merge request gitlab-org/gitlab-ce!18656

Merge branch 'revert-discussion-counter-height' into 'master'
8b3db0d6 · Filipa Lacerda · c34061db · 4c5829d7 · 8b3db0d6 · 8b3db0d6
Commit 8b3db0d6 authored Apr 30, 2018 by Filipa Lacerda
3 changed files
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -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>

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -772,7 +772,3 @@ ul.notes {
    height: auto;
  }
 }
-
-.line-resolve-text {
-  vertical-align: middle;
-}
--- a/changelogs/unreleased/revert-discussion-counter-height.yml
+++ b/changelogs/unreleased/revert-discussion-counter-height.yml
+---
+title: Revert discussion counter height
+merge_request: 18656
+author: George Tsiolis
+type: changed