diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-14 19:33:59 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-14 19:33:59 +0000 |
| commit | e9d6651f42507d87aeb84a17fc6c0b6298bce856 (patch) | |
| tree | 0db22ef72536acefdbf20ea5462343d6f15c65ad | |
| parent | 7de16665e2efef784a7237805f177de1a3c5e9ac (diff) | |
| parent | 973c5240fe16a134f80ff2b9d99070cb4b49f2a8 (diff) | |
| download | gitlab-ce-e9d6651f42507d87aeb84a17fc6c0b6298bce856.tar.gz | |
Merge branch '53918-snippet-commit-comments' into 'master'
Fix styling of snippet and commit discussion comments
Closes #53918
See merge request gitlab-org/gitlab-ce!23035
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 20 | ||||
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 8 |
2 files changed, 24 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 3dc1954e00d..e4f59778d1e 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -914,3 +914,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; + } +} diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 1765251c93d..10187129a33 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -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 |