diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-23 20:02:40 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-23 20:02:40 +0000 |
| commit | bf04a3a9b25d325ea4cb0c00338c18326b11b5dc (patch) | |
| tree | 7172a98e8763d1c524f2afa55f0bd79fdf37e5c2 | |
| parent | 32f6f5b9aa4bab07894b7823fab7e354078b9072 (diff) | |
| parent | eed6bfe2e5179f4d8d07c244d2b2f880da8e183f (diff) | |
| download | gitlab-ce-bf04a3a9b25d325ea4cb0c00338c18326b11b5dc.tar.gz | |
Merge branch '25989-fix-rogue-scrollbars-on-comments' into 'master'
Remove rogue scrollbars from some issue comments
Closes #25989
See merge request !8652
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index cbe38b60d60..da0caa30c26 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -195,10 +195,10 @@ ul.notes { } .note-body { - overflow: auto; + overflow-x: auto; + overflow-y: hidden; .note-text { - overflow: auto; word-wrap: break-word; @include md-typography; // Reset ul style types since we're nested inside a ul already diff --git a/changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml b/changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml new file mode 100644 index 00000000000..e67a9c0da15 --- /dev/null +++ b/changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml @@ -0,0 +1,4 @@ +--- +title: Remove rogue scrollbars for issue comments with inline elements +merge_request: +author: |