Commit 0ddeea1d authored by Phil Hughes's avatar Phil Hughes

Merge branch 'dmishunov-md-file-removal' into 'master'

Cleanup: Removed md-file CSS class

See merge request gitlab-org/gitlab!26083
parents 330b7d5e eaddd774
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
max-width: 100%; max-width: 100%;
} }
&:not(.md-file) img:not(.emoji) { &:not(.md) img:not(.emoji) {
border: 1px solid $white-normal; border: 1px solid $white-normal;
padding: 5px; padding: 5px;
margin: 5px 0; margin: 5px 0;
......
- if @wiki_home.present? - if @wiki_home.present?
%div{ class: container_class } %div{ class: container_class }
.md.md-file.prepend-top-default.append-bottom-default .md.prepend-top-default.append-bottom-default
= render_wiki_content(@wiki_home) = render_wiki_content(@wiki_home)
- else - else
- can_create_wiki = can?(current_user, :create_wiki, @project) - can_create_wiki = can?(current_user, :create_wiki, @project)
......
- if markup?(@blob.name) - if markup?(@blob.name)
.file-content.md.md-file .file-content.md
= markup(@blob.name, @content) = markup(@blob.name, @content)
- else - else
.diff-file .diff-file
......
- blob = viewer.blob - blob = viewer.blob
- context = blob.respond_to?(:rendered_markup) ? { rendered: blob.rendered_markup } : {} - context = blob.respond_to?(:rendered_markup) ? { rendered: blob.rendered_markup } : {}
.file-content.md.md-file .file-content.md
= markup(blob.name, blob.data, context) = markup(blob.name, blob.data, context)
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= (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 = (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
.prepend-top-default.append-bottom-default .prepend-top-default.append-bottom-default
.md.md-file{ data: { qa_selector: 'wiki_page_content' } } .md{ data: { qa_selector: 'wiki_page_content' } }
= render_wiki_content(@page) = render_wiki_content(@page)
= render 'sidebar' = render 'sidebar'
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%i.fa.fa-file %i.fa.fa-file
%strong= snippet.file_name %strong= snippet.file_name
- if markup?(snippet.file_name) - if markup?(snippet.file_name)
.file-content.md.md-file .file-content.md
- snippet_chunks.each do |chunk| - snippet_chunks.each do |chunk|
- unless chunk[:data].empty? - unless chunk[:data].empty?
= markup(snippet.file_name, chunk[:data]) = markup(snippet.file_name, chunk[:data])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment