From bfddf9b65e1d4f04a2b5f8926c726bc22b36493e Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 20 May 2019 11:34:14 -0500 Subject: [PATCH] Fix border radius of discussions --- app/assets/stylesheets/framework/timeline.scss | 1 + app/assets/stylesheets/pages/notes.scss | 1 + changelogs/unreleased/58538-discussion-top-radius.yml | 5 +++++ 3 files changed, 7 insertions(+) create mode 100644 changelogs/unreleased/58538-discussion-top-radius.yml diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 3d5208c3db5..e8176e59c19 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -55,4 +55,5 @@ .discussion .timeline-entry { margin: 0; border-right: 0; + border-radius: $border-radius-default $border-radius-default 0 0; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index f2b67a693c3..fcb57db590a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -107,6 +107,7 @@ $note-form-margin-left: 72px; &.collapsed { color: $gl-text-color-secondary; + border-radius: 0 0 $border-radius-default $border-radius-default; svg { float: left; diff --git a/changelogs/unreleased/58538-discussion-top-radius.yml b/changelogs/unreleased/58538-discussion-top-radius.yml new file mode 100644 index 00000000000..0fb16055623 --- /dev/null +++ b/changelogs/unreleased/58538-discussion-top-radius.yml @@ -0,0 +1,5 @@ +--- +title: Fix border radius of discussions +merge_request: 28490 +author: +type: fixed