summaryrefslogtreecommitdiffstats
path: root/lib/redcloth3.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-09-16 13:54:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-09-16 13:54:04 +0000
commitff0989a7022e717e8b200f62ad5c9cdc3b6cc440 (patch)
tree8db631ce1f816ab6cf3d358297bb9f3dd0d427ce /lib/redcloth3.rb
parent49d93a5cabf0cda5fe91eb6935e0dcb97c84589f (diff)
downloadredmine-ff0989a7022e717e8b200f62ad5c9cdc3b6cc440.tar.gz
redmine-ff0989a7022e717e8b200f62ad5c9cdc3b6cc440.zip
Accept float in inline styles.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10396 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redcloth3.rb')
-rw-r--r--lib/redcloth3.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index c91c61718..ee934b6ab 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -505,7 +505,7 @@ class RedCloth3 < String
atts
end
- STYLES_RE = /^(color|width|height|border|background|padding|margin|font|text)(-[a-z]+)*:\s*((\d+%?|\d+px|\d+(\.\d+)?em|#[0-9a-f]+|[a-z]+)\s*)+$/i
+ STYLES_RE = /^(color|width|height|border|background|padding|margin|font|text|float)(-[a-z]+)*:\s*((\d+%?|\d+px|\d+(\.\d+)?em|#[0-9a-f]+|[a-z]+)\s*)+$/i
def sanitize_styles(str)
styles = str.split(";").map(&:strip)