From eed6bfe2e5179f4d8d07c244d2b2f880da8e183f Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 19 Jan 2017 22:45:50 -0600
Subject: [PATCH] Remove rogue scrollbars for some issue comments
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/25989
---
app/assets/stylesheets/pages/notes.scss | 4 ++--
.../unreleased/25989-fix-rogue-scrollbars-on-comments.yml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml
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:
--
GitLab