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
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-04-12 18:10:40 +0300
committerClement Ho <clemmakesapps@gmail.com>2018-04-12 18:10:40 +0300
commit09ab85a936efad43d7ab01cb5dbfd533640ce2ef (patch)
treee0d6916d1501351998728616ca2ea13ec7a28b71 /app/assets/stylesheets/pages/note_form.scss
parent1e54e30ffc017efa350e2f372513aa55b5a0bd0c (diff)
Revert "Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master'"
This reverts merge request !18120
Diffstat (limited to 'app/assets/stylesheets/pages/note_form.scss')
-rw-r--r--app/assets/stylesheets/pages/note_form.scss13
1 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 8720f821ce9..4a528bc2bb1 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -173,7 +173,11 @@
}
.discussion-form {
- padding-top: $gl-padding-top;
+ background-color: $white-light;
+}
+
+.discussion-form-container {
+ padding: $gl-padding-top $gl-padding $gl-padding;
}
.discussion-notes .disabled-comment {
@@ -233,7 +237,12 @@
.discussion-body,
.diff-file {
.discussion-reply-holder {
- padding-top: $gl-padding;
+ background-color: $white-light;
+ padding: 10px 16px;
+
+ &.is-replying {
+ padding-bottom: $gl-padding;
+ }
}
}