summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-01-19 22:45:50 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-01-19 23:33:46 -0600
commiteed6bfe2e5179f4d8d07c244d2b2f880da8e183f (patch)
tree19512f6c279073f18512d72fb76296e64f3e1f0e
parent1bb0191a8a5302448bd0ebdbeaf5a3113723193d (diff)
downloadgitlab-ce-25989-fix-rogue-scrollbars-on-comments.tar.gz
Remove rogue scrollbars for some issue comments25989-fix-rogue-scrollbars-on-comments
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/25989
-rw-r--r--app/assets/stylesheets/pages/notes.scss4
-rw-r--r--changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml4
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: