diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-13 18:04:44 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-13 18:04:44 +0000 |
| commit | ed180aa96cabec1799694c038f3b20e4efd71daf (patch) | |
| tree | cdda10033c3fb92e0e33484500c81c614ace66f4 | |
| parent | 3bd219a45404a361a4e71ed1aea571bafe099b58 (diff) | |
| parent | a74544fcfed271bf9fad3d6409454a9c68f6d998 (diff) | |
| download | gitlab-ce-ed180aa96cabec1799694c038f3b20e4efd71daf.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/44024-fix-table-extra-column.yml | 5 |
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 |