diff --git a/README.md b/README.md index 5efaf8d9..1f4f3c63 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,12 @@ specified, default alignment is `left`. [[gollum.png|float]] +By default text will fill up all the space around the image. To control how +much should show up use this tag to stop and start a new block so that +additional content doesn't fill in. + + [[_]] + To specify a max-width, use the `width=` option. Units must be specified in either `px` or `em`. diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index b0e8ab3b..0596075b 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -729,3 +729,4 @@ ul.actions { padding: 0.25em; } +.clearfloats { clear:both } diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb index 405fc08f..db614772 100644 --- a/lib/gollum/markup.rb +++ b/lib/gollum/markup.rb @@ -236,6 +236,8 @@ module Gollum def process_tag(tag) if tag =~ /^_TOC_$/ %{[[#{tag}]]} + elsif tag =~ /^_$/ + %{
} elsif html = process_image_tag(tag) html elsif html = process_file_link_tag(tag)