diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-03-19 15:32:51 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-03-19 15:32:51 +0300 |
| commit | 66cea4234814300f76454e4e427251f6afb19bf0 (patch) | |
| tree | 0e18b87e1bb2e41a4e8f3118f1abd9046f240dff | |
| parent | e1739e47c5664c93c66dd58ded59f9d79cd8a426 (diff) | |
| download | gitlab-ce-_mr-refactor-part-6.tar.gz | |
MR Diffs Refactor Part 06: Notes styling for refactored version._mr-refactor-part-6
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 32 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 6 |
2 files changed, 36 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 085a2e74328..a71930cfd46 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -782,3 +782,35 @@ ul.notes { .line-resolve-text { vertical-align: middle; } + +// Vue refactored diff discussion adjustments +.files { + .diff-discussions { + .note-discussion.timeline-entry { + padding-left: 0; + + & > .timeline-entry-inner { + padding: 0; + + & > .timeline-content { + margin-left: 0; + } + + & > .timeline-icon { + display: none; + } + } + .discussion-body { + padding-top: 0; + + .discussion-wrapper { + border-color: transparent; + } + } + } + } + + .diff-comment-form { + display: block; + } +} diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 9866cc716ee..112f27ef513 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -87,8 +87,10 @@ #pipelines.pipelines.tab-pane - if @pipelines.any? = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) - #diffs.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked? } } - -# This tab is always loaded via AJAX + #js-diffs-app.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked?, endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json') } } + + - unless has_vue_discussions_cookie? # TODO: @fatihacet This should be deleted after refactor + #diffs .mr-loading-status = spinner |