summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-05-21 19:01:57 +0000
committerFatih Acet <acetfatih@gmail.com>2019-05-21 19:01:57 +0000
commit9d98535621d498912d532daccddab4e2c883e9cb (patch)
treeb3e42063eef1dd7e4d60c5779b78414b62adfbf4
parentd6022e9deac732df62c2907fd43ae8646ffa43f7 (diff)
parentbfddf9b65e1d4f04a2b5f8926c726bc22b36493e (diff)
downloadgitlab-ce-9d98535621d498912d532daccddab4e2c883e9cb.tar.gz
Merge branch '58538-discussion-top-radius' into 'master'
Fix top border radius of discussions Closes #58538 See merge request gitlab-org/gitlab-ce!28490
-rw-r--r--app/assets/stylesheets/framework/timeline.scss1
-rw-r--r--app/assets/stylesheets/pages/notes.scss1
-rw-r--r--changelogs/unreleased/58538-discussion-top-radius.yml5
3 files changed, 7 insertions, 0 deletions
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