From 504e9e1ae068cb1ad2b3261f7533fe09dd03c3a1 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Wed, 14 Nov 2018 23:17:02 +0200 Subject: Remove unnecessary line before reply holder --- app/assets/stylesheets/pages/note_form.scss | 11 ++++++++--- app/assets/stylesheets/pages/notes.scss | 1 - .../gt-remove-unnecessary-line-before-reply-holder.yml | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 97b3f696139..011fdf63fb7 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -236,17 +236,22 @@ table { } } -.discussion-body, -.diff-file { +.discussion-body { .discussion-reply-holder { background-color: $white-light; - padding: 10px 16px; border-radius: 0 0 3px 3px; + padding: 0 $gl-padding 10px; &.is-replying { padding-bottom: $gl-padding; } } + + .diff-file { + .discussion-reply-holder { + padding: 10px 16px; + } + } } .discussion-with-resolve-btn { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 39d01c49fd7..d40c34b2402 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -514,7 +514,6 @@ $note-form-margin-left: 72px; .discussion-reply-holder { border-radius: 0 0 $border-radius-default $border-radius-default; - border-top: 1px solid $border-color; position: relative; } } diff --git a/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml b/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml new file mode 100644 index 00000000000..142a9c1f2cc --- /dev/null +++ b/changelogs/unreleased/gt-remove-unnecessary-line-before-reply-holder.yml @@ -0,0 +1,5 @@ +--- +title: Remove unnecessary line before reply holder +merge_request: 23092 +author: George Tsiolis +type: changed -- cgit v1.2.1 From 78c10f72e270f3ea69eef914c36bb5a80d3d2857 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Fri, 16 Nov 2018 19:05:34 +0200 Subject: Fix discussion reply holder padding --- app/assets/stylesheets/framework/timeline.scss | 1 + app/assets/stylesheets/pages/note_form.scss | 13 ++++--------- app/assets/stylesheets/pages/notes.scss | 6 +----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 3d5208c3db5..233aada9c38 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -36,6 +36,7 @@ &:target, &.target { background: $line-target-blue; + margin-bottom: $gl-padding; &.system-note .note-body .note-text.system-note-commit-list::after { background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%); diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 011fdf63fb7..05cc52e9e5e 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -178,7 +178,7 @@ table { .discussion-form-container { - padding: $gl-padding-top $gl-padding $gl-padding; + padding: $gl-padding; } } @@ -236,22 +236,17 @@ table { } } -.discussion-body { +.discussion-body, +.commit-diff { .discussion-reply-holder { background-color: $white-light; border-radius: 0 0 3px 3px; - padding: 0 $gl-padding 10px; + padding: $gl-padding; &.is-replying { padding-bottom: $gl-padding; } } - - .diff-file { - .discussion-reply-holder { - padding: 10px 16px; - } - } } .discussion-with-resolve-btn { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index d40c34b2402..42ba7fcc20c 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -14,7 +14,7 @@ $note-form-margin-left: 72px; } @mixin outline-comment() { - margin: $gl-padding; + margin: $gl-padding $gl-padding 0; border: 1px solid $border-color; border-radius: $border-radius-default; } @@ -526,10 +526,6 @@ $note-form-margin-left: 72px; .notes_content { background-color: $white-light; } - - .discussion-reply-holder { - border-top: 1px solid $border-color; - } } .discussion-header, -- cgit v1.2.1 From 50de209607c62140de2acad597254f490ec69c47 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Tue, 20 Nov 2018 12:22:08 +0200 Subject: Restore diff-file discussion padding --- app/assets/stylesheets/pages/note_form.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 05cc52e9e5e..6aa0b779b42 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -237,6 +237,7 @@ table { } .discussion-body, +.diff-file, .commit-diff { .discussion-reply-holder { background-color: $white-light; -- cgit v1.2.1 From 076c3a987889710d8c5464cc60b0a9679ad76232 Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Mon, 3 Dec 2018 14:55:05 +0200 Subject: Restore top margin for active discussion notes --- app/assets/stylesheets/pages/notes.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 42ba7fcc20c..6cab255a18e 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -167,7 +167,6 @@ $note-form-margin-left: 72px; &:not(:first-child) { border-top: 1px solid $white-normal; - margin-top: -1px; } .timeline-entry-inner { -- cgit v1.2.1 From 63e2c97b36d0c14db36ed97e0822394f50d4dc8c Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Wed, 5 Dec 2018 11:03:20 -0600 Subject: Remove boxes around code comments --- .../notes/components/noteable_discussion.vue | 4 +-- app/assets/stylesheets/framework/timeline.scss | 1 - app/assets/stylesheets/pages/note_form.scss | 7 ++-- app/assets/stylesheets/pages/notes.scss | 39 +++++----------------- app/views/shared/notes/_note.html.haml | 2 +- 5 files changed, 15 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index d4450c9f2c8..d309fea3c98 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -394,7 +394,7 @@ Please check your network connection and try again.`;