Commit 8763022d authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '32715-fix-note-padding' into 'master'

32715 Make all notes use equal padding

Closes #32715 and #32467

See merge request !11616
parents af50d334 1725dc08
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
} }
.timeline-entry { .timeline-entry {
padding: $gl-padding $gl-btn-padding 0;
border-color: $white-normal; border-color: $white-normal;
color: $gl-text-color; color: $gl-text-color;
border-bottom: 1px solid $border-white-light; border-bottom: 1px solid $border-white-light;
......
...@@ -43,7 +43,11 @@ ul.notes { ...@@ -43,7 +43,11 @@ ul.notes {
} }
.discussion-body { .discussion-body {
padding-top: 15px; padding-top: 8px;
.panel {
margin-bottom: 0;
}
} }
.discussion { .discussion {
...@@ -53,6 +57,7 @@ ul.notes { ...@@ -53,6 +57,7 @@ ul.notes {
} }
.note { .note {
padding: $gl-padding $gl-btn-padding 0;
display: block; display: block;
position: relative; position: relative;
border-bottom: 1px solid $white-normal; border-bottom: 1px solid $white-normal;
...@@ -78,7 +83,7 @@ ul.notes { ...@@ -78,7 +83,7 @@ ul.notes {
&.note-discussion { &.note-discussion {
&.timeline-entry { &.timeline-entry {
padding: 14px 10px; padding: $gl-padding 10px;
} }
} }
...@@ -163,7 +168,7 @@ ul.notes { ...@@ -163,7 +168,7 @@ ul.notes {
margin-left: 65px; margin-left: 65px;
} }
.note-header { .note-header-info {
padding-bottom: 0; padding-bottom: 0;
} }
...@@ -373,7 +378,7 @@ ul.notes { ...@@ -373,7 +378,7 @@ ul.notes {
.note-header-info { .note-header-info {
min-width: 0; min-width: 0;
padding-bottom: 5px; padding-bottom: 8px;
} }
.system-note .note-header-info { .system-note .note-header-info {
......
---
title: Make all notes use equal padding
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment