Permalink
Browse files

Merge branch 'master' of github.com:sunteya/lm2doc

Conflicts:
	lib/lm2doc/markdown.rb
	themes/bootstrap/style.scss
  • Loading branch information...
2 parents 7d75489 + cfa51c9 commit fdaaf124f68165467716c0f2d4f5e01877d732a8 @sunteya committed May 10, 2012
Showing with 23 additions and 3 deletions.
  1. +14 −0 .gitignore
  2. +3 −3 lib/lm2doc/markdown.rb
  3. +1 −0 lib/lm2doc/theme/compass_resource.rb
  4. +5 −0 themes/bootstrap/style.scss
View
@@ -7,3 +7,17 @@ Gemfile.lock
tmp
examples
.sass-cache
+/images/rails_welcome.png
+/images/sample/fjdskafdkasfdsaf_html_1ceb4e50.gif
+/images/sample/fjdskafdkasfdsaf_html_1dd5d304.png
+/images/sample/fjdskafdkasfdsaf_html_43536aa8.png
+/images/sample/fjdskafdkasfdsaf_html_465cc54d.png
+/images/sample/fjdskafdkasfdsaf_html_699d6865.png
+/images/sample/fjdskafdkasfdsaf_html_734e99e5.jpg
+/images/sample/fjdskafdkasfdsaf_html_m6e037855.png
+/views/example.html
+/views/mam_apis.md
+/views/sample.html
+/mam_apis/mam_apis.html
+/mam_apis/style.css
+/stylesheets/bootstrap.min.css
View
@@ -5,12 +5,12 @@
module Lm2doc
class Markdown < Source
-
def convert
html = Kramdown::Document.new(self.content,
- coderay_line_numbers: :table
+ coderay_line_numbers: :table,
+ toc_levels: => [ 2, 3 ]
).to_html
-
+
doc = Nokogiri::HTML::DocumentFragment.parse(html)
figure_role(doc)
@@ -7,6 +7,7 @@ class Theme
class CompassResource < Hashie::Mash
def file_out(dir, options = {})
+ FileUtils.mkdir_p(Lm2doc.root.join("tmp"))
Dir.mktmpdir(nil, Lm2doc.root.join("tmp")) do |tmppath|
tmpdir = Pathname.new(tmppath)
Compass.configuration.sass_path = self.scss_pathname
@@ -58,6 +58,11 @@ article {
text-align: center;
font-style: italic;
}
+
+ table {
+ @extend .table;
+ @extend .table-bordered;
+ }
}
}

0 comments on commit fdaaf12

Please sign in to comment.