deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve wiki rendering. Fix pygemnt + markdown invalid html

4-1-stable
Dmitriy Zaporozhets 2012-12-22 13:01:15 +02:00
parent ed35ea703c
commit cec866a7ce
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/gitlab_bootstrap/files.scss
View File

@ -43,11 +43,15 @@
padding: 0 4px;
}
padding: 20px;
h1, h2 {
line-height: 46px;
}
h3, h4 {
line-height: 40px;
h1 { font-size: 26px; line-height: 46px; }
h2 { font-size: 22px; line-height: 42px; }
h3 { font-size: 20px; line-height: 40px; }
h4 { font-size: 18px; line-height: 32px; }
h5 { font-size: 16px; line-height: 26px; }
.white .highlight pre {
background: #f5f5f5;
}
}

13
lib/redcarpet/render/gitlab_html.rb
View File

@ -11,14 +11,13 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
def block_code(code, language)
options = { options: {encoding: 'utf-8'} }
options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language)
h.content_tag :div, class: h.user_color_scheme_class do
if Pygments::Lexer.find(language)
Pygments.highlight(code, options.merge(lexer: language.downcase))
else
Pygments.highlight(code, options)
end.html_safe
end
<<-HTML
<div class="#{h.user_color_scheme_class}">
#{Pygments.highlight(code, options)}
</div>
HTML
end
def postprocess(full_document)