summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-19 16:35:09 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-19 16:35:09 +0000
commit604c9133a75b235e3b537ad96dcf92ed6949ed65 (patch)
treeed5f2121e762a32be92dd1f5c79d03c6f2fa1999
parent97017cea65a5a88ba2f59f37abccf54db24e7e7a (diff)
parent0307668ca17b5d479ff484aecdc6e0b578e60b08 (diff)
downloadgitlab-ce-604c9133a75b235e3b537ad96dcf92ed6949ed65.tar.gz
Merge branch 'fix/add-horizontal-scroll-to-wiki-tables' into 'master'
Add horizontal scroll to wiki tables #26557 See merge request gitlab-org/gitlab-ce!16527
-rw-r--r--app/assets/stylesheets/framework/mixins.scss2
-rw-r--r--changelogs/unreleased/fix-add-horizontal-scroll-to-wiki-tables.yml5
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index e12b5aab381..ddd9dbb2be4 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -17,6 +17,8 @@
*/
@mixin markdown-table {
width: auto;
+ display: block;
+ overflow-x: auto;
}
/*
diff --git a/changelogs/unreleased/fix-add-horizontal-scroll-to-wiki-tables.yml b/changelogs/unreleased/fix-add-horizontal-scroll-to-wiki-tables.yml
new file mode 100644
index 00000000000..d8e97b7ad04
--- /dev/null
+++ b/changelogs/unreleased/fix-add-horizontal-scroll-to-wiki-tables.yml
@@ -0,0 +1,5 @@
+---
+title: Add horizontal scroll to wiki tables
+merge_request: 16527
+author: George Tsiolis
+type: fixed