summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2018-03-09 11:29:10 -0600
committerEric Eastwood <contact@ericeastwood.com>2018-03-09 11:52:00 -0600
commita74544fcfed271bf9fad3d6409454a9c68f6d998 (patch)
tree71a8082741bf2240c303a53c7ef993e4db86adbd
parent7734e85bc6592c5ad3330c611c5f83a051b680b0 (diff)
downloadgitlab-ce-44024-fix-table-extra-column.tar.gz
Fix markdown table showing an extra rake column44024-fix-table-extra-column
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/44024
-rw-r--r--app/assets/stylesheets/framework/mixins.scss2
-rw-r--r--app/assets/stylesheets/pages/wiki.scss5
-rw-r--r--changelogs/unreleased/44024-fix-table-extra-column.yml5
3 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index ddd9dbb2be4..e12b5aab381 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -17,8 +17,6 @@
*/
@mixin markdown-table {
width: auto;
- display: block;
- overflow-x: auto;
}
/*
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index e70a57c2a67..9a0ec936979 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -180,6 +180,11 @@ ul.wiki-pages-list.content-list {
}
}
+.wiki-holder {
+ overflow-x: auto;
+ overflow-y: hidden;
+}
+
.wiki {
table {
@include markdown-table;
diff --git a/changelogs/unreleased/44024-fix-table-extra-column.yml b/changelogs/unreleased/44024-fix-table-extra-column.yml
new file mode 100644
index 00000000000..92c354a0844
--- /dev/null
+++ b/changelogs/unreleased/44024-fix-table-extra-column.yml
@@ -0,0 +1,5 @@
+---
+title: Fix markdown table showing extra column
+merge_request: 17669
+author:
+type: fixed