diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 21:40:33 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 21:40:33 +0000 |
| commit | 35816eb7be76aa1a26dcf2f9cfeddf7c60b2da26 (patch) | |
| tree | b1b1c1425b68c61e21c7455f82697003afd7b393 | |
| parent | 6c70d7f90bf8be05b67b3ec9ed2eeda3e9f524ea (diff) | |
| parent | 729572cd5b0e416bcf03aef936d8a27e93d84027 (diff) | |
| download | gitlab-ce-35816eb7be76aa1a26dcf2f9cfeddf7c60b2da26.tar.gz | |
Merge branch '44956-wiki-headings-no-longer-show-anchor-link' into 'master'
Resolve "Wiki headings no longer show anchor link"
Closes #44956
See merge request gitlab-org/gitlab-ce!18591
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/_wiki.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index e12b5aab381..9ff24ebc127 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -17,6 +17,16 @@ */ @mixin markdown-table { width: auto; + display: inline-block; + overflow-x: auto; + border-left: 0; + border-right: 0; + border-bottom: 0; + + @supports(width: fit-content) { + display: block; + width: fit-content; + } } /* diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index 9a0ec936979..e70a57c2a67 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -180,11 +180,6 @@ ul.wiki-pages-list.content-list { } } -.wiki-holder { - overflow-x: auto; - overflow-y: hidden; -} - .wiki { table { @include markdown-table; diff --git a/app/views/projects/_wiki.html.haml b/app/views/projects/_wiki.html.haml index a56c3503c77..5646dc464f8 100644 --- a/app/views/projects/_wiki.html.haml +++ b/app/views/projects/_wiki.html.haml @@ -1,6 +1,6 @@ - if @wiki_home.present? %div{ class: container_class } - .wiki-holder.prepend-top-default.append-bottom-default + .prepend-top-default.append-bottom-default .wiki = render_wiki_content(@wiki_home) - else diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index b3b83cee81a..ff72c8bb75d 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -24,7 +24,7 @@ - history_link = link_to s_("WikiHistoricalPage|history"), project_wiki_history_path(@project, @page) = (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe -.wiki-holder.prepend-top-default.append-bottom-default +.prepend-top-default.append-bottom-default .wiki = render_wiki_content(@page) |