diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-01-11 01:32:18 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-01-11 01:32:18 +0000 |
| commit | e4142a833884205050309d4141e28c1b3bb1fe8c (patch) | |
| tree | a1c080d8165414cab7e08e4e4138059f80b3a1f5 /lib | |
| parent | 9bf152c5b0cc2fdc408b09d344c4ae63a7fe76fc (diff) | |
| download | redmine-e4142a833884205050309d4141e28c1b3bb1fe8c.tar.gz redmine-e4142a833884205050309d4141e28c1b3bb1fe8c.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/redcloth3.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |