From e4142a833884205050309d4141e28c1b3bb1fe8c Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 11 Jan 2018 01:32:18 +0000 Subject: Allow "max-height", "max-width", "min-height" and "min-width" CSS properties in Textile (#26552). Patch by Michael Gerz and Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17173 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/wiki_formatting/textile/redcloth3.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb index 7ed29bbd8..291a0e2d4 100644 --- a/lib/redmine/wiki_formatting/textile/redcloth3.rb +++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb @@ -514,7 +514,7 @@ class RedCloth3 < String atts end - 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 + STYLES_RE = /^(color|(min-|max-)?+(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) -- cgit v1.2.3