diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-11-14 18:43:30 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-14 18:43:30 +0000 |
| commit | 7de16665e2efef784a7237805f177de1a3c5e9ac (patch) | |
| tree | a86826968b5f23ad3e2fb469e19cad47310d728b | |
| parent | 5b1b093403f8a3108a5de6572fd503cef763ae81 (diff) | |
| parent | fee29d955840747439be745de53045165cdd9a98 (diff) | |
| download | gitlab-ce-7de16665e2efef784a7237805f177de1a3c5e9ac.tar.gz | |
Merge branch 'discussion-fixes-2' into 'master'
Fix vertical line alignment in discussion & diff border-radius
Closes #53975
See merge request gitlab-org/gitlab-ce!23075
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 45b921a2fbb..97b3f696139 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -241,7 +241,7 @@ table { .discussion-reply-holder { background-color: $white-light; padding: 10px 16px; - border-radius: 0 0 $border-radius-default $border-radius-default; + border-radius: 0 0 3px 3px; &.is-replying { padding-bottom: $gl-padding; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 05322d7fab7..3dc1954e00d 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -28,7 +28,7 @@ $note-form-margin-left: 72px; } .main-notes-list { - @include vertical-line(39px); + @include vertical-line(36px); } .notes { |