diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-13 21:04:44 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-14 02:27:57 +0300 |
| commit | 146053b9e89ee07fb0db2b8edcf113f96d80c3d6 (patch) | |
| tree | c3555f1845247ef4bea74660deb7feb92a13c772 /app/assets | |
| parent | efcfc15d19160277cfb9170be3e0651f8b41a511 (diff) | |
Merge branch '44024-fix-table-extra-column' into 'master'
Fix markdown table showing extra fake column v1
Closes #44024
See merge request gitlab-org/gitlab-ce!17669
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 5 |
2 files changed, 5 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; |