Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2018-11-15 00:17:02 +0300
committerGeorge Tsiolis <tsiolis.g@gmail.com>2018-12-10 15:45:26 +0300
commit504e9e1ae068cb1ad2b3261f7533fe09dd03c3a1 (patch)
tree2de8046d7c5b909989686d393aba7d47eee9e63a /app
parent5c5a5992c0602f14c7f4f43b5fc2756662fafb3c (diff)
Remove unnecessary line before reply holder
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/note_form.scss11
-rw-r--r--app/assets/stylesheets/pages/notes.scss1
2 files changed, 8 insertions, 4 deletions
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;
}
}