From 624e3243834f0f242057ea5c774a63ac5e8d304d Mon Sep 17 00:00:00 2001 From: lemonsqueeze Date: Tue, 19 Mar 2013 17:37:08 +0100 Subject: [PATCH 1/2] [[_]] float clearing tag experiment --- README.md | 6 ++++++ lib/gollum/frontend/public/gollum/css/gollum.css | 1 + lib/gollum/markup.rb | 2 ++ 3 files changed, 9 insertions(+) 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) From 7a70169d060e6534ad511aed11060347f17cd5e2 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 19 Mar 2013 19:35:54 -0300 Subject: [PATCH 2/2] Fix style --- lib/gollum/frontend/public/gollum/css/gollum.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 0596075b..e856eb0f 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -729,4 +729,6 @@ ul.actions { padding: 0.25em; } -.clearfloats { clear:both } +.clearfloats { + clear: both; +}