diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-25 11:45:06 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-25 11:45:06 +0000 |
| commit | 4e045cd5aa0faf6f6279e8d477a15c9072f679b6 (patch) | |
| tree | 812d78c6e0c2a68857101f2396e73e3454b61777 | |
| parent | 6abd3880fbbf24471a3ea89677620049481edae3 (diff) | |
| parent | 3b50596c5dd3859561f6862290aa21632c6d5c03 (diff) | |
| download | gitlab-ce-4e045cd5aa0faf6f6279e8d477a15c9072f679b6.tar.gz | |
Merge branch 'fix/missing-border' into 'master'
fix(ui-bug): missing border of comments
Closes #58915 and #58538
See merge request gitlab-org/gitlab-ce!26242
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-missing-border.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 88984cae513..9c72dcbc54c 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -44,6 +44,7 @@ $note-form-margin-left: 72px; border: 1px solid $border-color; border-radius: $border-radius-default; margin: $gl-padding 0; + overflow: auto; &.system-note, &.note-form { diff --git a/changelogs/unreleased/fix-missing-border.yml b/changelogs/unreleased/fix-missing-border.yml new file mode 100644 index 00000000000..21728223cb8 --- /dev/null +++ b/changelogs/unreleased/fix-missing-border.yml @@ -0,0 +1,5 @@ +--- +title: Fixes missing border color in discussion card component +merge_request: 26242 +author: Farhad Yasir +type: fixed |