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

Fix styling of snippet and commit discussion comments

This commit is contained in:
Annabel Dunstone Gray 2018-11-13 21:25:35 -06:00
parent 078fab665b
commit 973c5240fe
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -910,3 +910,23 @@ $note-form-margin-left: 72px;
}
}
}
//This needs to be deleted when Snippet/Commit comments are convered to Vue
// See https://gitlab.com/gitlab-org/gitlab-ce/issues/53918#note_117038785
.unstyled-comments {
.discussion-header {
padding: $gl-padding;
border-bottom: 1px solid $border-color;
}
.note-wrapper.outlined {
margin: 0;
border: 0;
border-radius: 0;
}
.discussion-form-container {
padding: $gl-padding;
}
}

8
app/views/discussions/_discussion.html.haml
View File

@ -1,12 +1,12 @@
- expanded = discussion.expanded?
%li.note.note-discussion.timeline-entry
%li.note.note-discussion.timeline-entry.unstyled-comments
.timeline-entry-inner
.timeline-icon
= link_to user_path(discussion.author) do
= image_tag avatar_icon_for_user(discussion.author), class: "avatar s40"
.timeline-content
.discussion.js-toggle-container{ data: { discussion_id: discussion.id } }
.discussion-header
.timeline-icon
= link_to user_path(discussion.author) do
= image_tag avatar_icon_for_user(discussion.author), class: "avatar s40"
.discussion-actions
%button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
- if expanded