diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-01 02:42:22 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-01 02:42:22 +0300 |
| commit | 8b3db0d64beb204dfa722b81cfc32843e19a8eae (patch) | |
| tree | 46c1e98d72a5473ccb56d1a8a5b5882f081686fa | |
| parent | c34061db9676abdd7147c493cf8bb68d5fbf3a6b (diff) | |
| parent | 4c5829d7ac35900fdc51f683b740c40d43f07dc0 (diff) | |
Merge branch 'revert-discussion-counter-height' into 'master'
Revert discussion counter height
Closes #45896
See merge request gitlab-org/gitlab-ce!18656
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/revert-discussion-counter-height.yml | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index d492d1cd001..cbe4774a360 100644 --- 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> diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 81e98f358a8..6d5c6cb136f 100644 --- 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; -} diff --git a/changelogs/unreleased/revert-discussion-counter-height.yml b/changelogs/unreleased/revert-discussion-counter-height.yml new file mode 100644 index 00000000000..331ff997009 --- /dev/null +++ b/changelogs/unreleased/revert-discussion-counter-height.yml @@ -0,0 +1,5 @@ +--- +title: Revert discussion counter height +merge_request: 18656 +author: George Tsiolis +type: changed |