kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Clement Ho 2018-05-10 21:40:33 +00:00
parent 6c70d7f90b 729572cd5b
commit 35816eb7be
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/framework/mixins.scss
View File

@ -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;
}
}
/*

5
app/assets/stylesheets/pages/wiki.scss
View File

@ -180,11 +180,6 @@ ul.wiki-pages-list.content-list {
}
}
.wiki-holder {
overflow-x: auto;
overflow-y: hidden;
}
.wiki {
table {
@include markdown-table;

2
app/views/projects/_wiki.html.haml
View File

@ -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

2
app/views/projects/wikis/show.html.haml
View File

@ -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)