summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-08-09 12:06:46 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-09 12:06:46 +0000
commit2faaff5ddc38a4224969608e2216c93c289bf0d9 (patch)
tree8be2b6363daf66d8ecb179d1499265437bdca90e
parent9e19125f391edd90d74d60720a3a8887d9ce1258 (diff)
parent3b2ec551d9ef40b506eccd3d46cf31f267ea37ae (diff)
downloadgitlab-ce-2faaff5ddc38a4224969608e2216c93c289bf0d9.tar.gz
Merge branch '63671-remove-extra-padding-from-the-disabled-comment-area' into 'master'
Resolve "Remove extra padding from the disabled comment area" Closes #63671 See merge request gitlab-org/gitlab-ce!31603
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
-rw-r--r--changelogs/unreleased/63671-remove-extra-padding-from-the-disabled-comment-area.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index b9b8eabf909..6c03dbb56a7 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -806,7 +806,7 @@ $note-form-margin-left: 72px;
border-radius: $border-radius-base;
border: 1px solid $border-gray-normal;
color: $note-disabled-comment-color;
- padding: 90px 0;
+ padding: $gl-padding-8 0;
&.discussion-locked {
border: 0;
diff --git a/changelogs/unreleased/63671-remove-extra-padding-from-the-disabled-comment-area.yml b/changelogs/unreleased/63671-remove-extra-padding-from-the-disabled-comment-area.yml
new file mode 100644
index 00000000000..ab116674ced
--- /dev/null
+++ b/changelogs/unreleased/63671-remove-extra-padding-from-the-disabled-comment-area.yml
@@ -0,0 +1,5 @@
+---
+title: Remove extra padding from disabled comment box
+merge_request: 31603
+author:
+type: fixed