Fixed TOC positionning in wiki pages.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@791 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed TOC positionning in wiki pages.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@791 e93f8b46-1217-0410-a6f0-8f06a7374b81
48fb20f5 · Jean-Philippe Lang · 0fc93a11 · 48fb20f5 · 48fb20f5
Commit 48fb20f5 authored Oct 01, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

wiki_formatting.rb lib/redmine/wiki_formatting.rb +1 -0

application.css public/stylesheets/application.css +4 -6

No files found.
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -60,6 +60,7 @@ module Redmine
        text.gsub!(/<p>\{\{([<>]?)toc\}\}<\/p>/i) do
          div_class = 'toc'
          div_class << ' right' if $1 == '>'
+          div_class << ' left' if $1 == '<'
          out = "<div class=\"#{div_class}\">"
          @toc.each_with_index do |heading, index|
            # remove wiki links from the item

--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -310,14 +310,12 @@ div.wiki div.toc {
    line-height: 1.2em;
    margin-bottom: 12px;
    margin-right: 12px;
-    float: left;
+    display: table
 }
+* html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */

-div.wiki div.toc.right {
-    float: right;
-    margin-left: 12px;
-    margin-right: 0;
-}
+div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
+div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }

 div.wiki div.toc a {
    display: block;