summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-24 19:10:15 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-24 19:10:15 +0000
commit8763022d2bfa81fdc6ceab27f4530107e0ceaa0c (patch)
treeeb25b52e8cc454a0af2f87af37831118310a5803
parentaf50d334e70851164eb1b9bb5468581dd5c7dd4f (diff)
parent1725dc0857c5bb0f973f78632680cf1a9904c424 (diff)
downloadgitlab-ce-8763022d2bfa81fdc6ceab27f4530107e0ceaa0c.tar.gz
Merge branch '32715-fix-note-padding' into 'master'
32715 Make all notes use equal padding Closes #32715 and #32467 See merge request !11616
-rw-r--r--app/assets/stylesheets/framework/timeline.scss1
-rw-r--r--app/assets/stylesheets/pages/notes.scss13
-rw-r--r--changelogs/unreleased/32715-fix-note-padding.yml4
3 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 515e6f0b2b1..1fd734d279b 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -23,7 +23,6 @@
}
.timeline-entry {
- padding: $gl-padding $gl-btn-padding 0;
border-color: $white-normal;
color: $gl-text-color;
border-bottom: 1px solid $border-white-light;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 5550c0d5b47..51918917329 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -43,7 +43,11 @@ ul.notes {
}
.discussion-body {
- padding-top: 15px;
+ padding-top: 8px;
+
+ .panel {
+ margin-bottom: 0;
+ }
}
.discussion {
@@ -53,6 +57,7 @@ ul.notes {
}
.note {
+ padding: $gl-padding $gl-btn-padding 0;
display: block;
position: relative;
border-bottom: 1px solid $white-normal;
@@ -78,7 +83,7 @@ ul.notes {
&.note-discussion {
&.timeline-entry {
- padding: 14px 10px;
+ padding: $gl-padding 10px;
}
}
@@ -163,7 +168,7 @@ ul.notes {
margin-left: 65px;
}
- .note-header {
+ .note-header-info {
padding-bottom: 0;
}
@@ -373,7 +378,7 @@ ul.notes {
.note-header-info {
min-width: 0;
- padding-bottom: 5px;
+ padding-bottom: 8px;
}
.system-note .note-header-info {
diff --git a/changelogs/unreleased/32715-fix-note-padding.yml b/changelogs/unreleased/32715-fix-note-padding.yml
new file mode 100644
index 00000000000..867ed7eb171
--- /dev/null
+++ b/changelogs/unreleased/32715-fix-note-padding.yml
@@ -0,0 +1,4 @@
+---
+title: Make all notes use equal padding
+merge_request:
+author: