Improve wiki rendering. Fix pygemnt + markdown invalid html

Dmitriy Zaporozhets
1 parent ed35ea70
Showing 2 changed files with 15 additions and 12 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/files.scss
lib/redcarpet/render/gitlab_html.rb
@@ -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;
       }
     }
  
@@ -11,14 +11,13 @@ class Redcarpet::Render::GitlabHTML &lt; 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)
...	...	@@ -43,11 +43,15 @@
43	43	padding: 0 4px;
44	44	}
45	45	padding: 20px;
46		- h1, h2 {
47		- line-height: 46px;
48		- }
49		- h3, h4 {
50		- line-height: 40px;
	46	+
	47	+ h1 { font-size: 26px; line-height: 46px; }
	48	+ h2 { font-size: 22px; line-height: 42px; }
	49	+ h3 { font-size: 20px; line-height: 40px; }
	50	+ h4 { font-size: 18px; line-height: 32px; }
	51	+ h5 { font-size: 16px; line-height: 26px; }
	52	+
	53	+ .white .highlight pre {
	54	+ background: #f5f5f5;
51	55	}
52	56	}
53	57
...	...
...	...	@@ -11,14 +11,13 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
11	11
12	12	def block_code(code, language)
13	13	options = { options: {encoding: 'utf-8'} }
	14	+ options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language)
14	15
15		- h.content_tag :div, class: h.user_color_scheme_class do
16		- if Pygments::Lexer.find(language)
17		- Pygments.highlight(code, options.merge(lexer: language.downcase))
18		- else
19		- Pygments.highlight(code, options)
20		- end.html_safe
21		- end
	16	+ <<-HTML
	17	+ <div class="#{h.user_color_scheme_class}">
	18	+ #{Pygments.highlight(code, options)}
	19	+ </div>
	20	+ HTML
22	21	end
23	22
24	23	def postprocess(full_document)
...	...