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
4c5829d7
Commit
4c5829d7
authored
Apr 30, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert discussion counter height
parent
ee189fd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
app/assets/javascripts/notes/components/discussion_counter.vue
...ssets/javascripts/notes/components/discussion_counter.vue
+1
-1
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+0
-4
changelogs/unreleased/revert-discussion-counter-height.yml
changelogs/unreleased/revert-discussion-counter-height.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/discussion_counter.vue
View file @
4c5829d7
...
@@ -86,7 +86,7 @@ export default {
...
@@ -86,7 +86,7 @@ export default {
v-html=
"resolveSvg"
v-html=
"resolveSvg"
></span>
></span>
</span>
</span>
<span
class=
"
.
line-resolve-text"
>
<span
class=
"line-resolve-text"
>
{{
resolvedDiscussionCount
}}
/
{{
discussionCount
}}
{{
countText
}}
resolved
{{
resolvedDiscussionCount
}}
/
{{
discussionCount
}}
{{
countText
}}
resolved
</span>
</span>
</div>
</div>
...
...
app/assets/stylesheets/pages/notes.scss
View file @
4c5829d7
...
@@ -772,7 +772,3 @@ ul.notes {
...
@@ -772,7 +772,3 @@ ul.notes {
height
:
auto
;
height
:
auto
;
}
}
}
}
.line-resolve-text
{
vertical-align
:
middle
;
}
changelogs/unreleased/revert-discussion-counter-height.yml
0 → 100644
View file @
4c5829d7
---
title
:
Revert discussion counter height
merge_request
:
18656
author
:
George Tsiolis
type
:
changed
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