diff --git a/.datatables-commit-sync b/.datatables-commit-sync index d3d6d6ff..05bedca7 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -8bbe3332c9d5b5c51908814c1af6ccca9c597877 +1ea587a68521fd3b09701a255111f379b4d4b491 diff --git a/examples/resources/demo.css b/examples/resources/demo.css index 1268dda2..7c7b5ff9 100644 --- a/examples/resources/demo.css +++ b/examples/resources/demo.css @@ -261,6 +261,10 @@ code.multiline { width: 95%; } +div.syntaxhighlighter code:after { + display: none; +} + ul.tabs { position: relative; diff --git a/examples/resources/syntax/shCore.css b/examples/resources/syntax/shCore.css index e14cc049..9ced738a 100644 --- a/examples/resources/syntax/shCore.css +++ b/examples/resources/syntax/shCore.css @@ -134,7 +134,7 @@ .syntaxhighlighter .toolbar { position: absolute !important; right: 1px !important; - top: 1px !important; + top: -18px !important; font-size: 10px !important; z-index: 7 !important; } diff --git a/examples/resources/syntax/shCore.js b/examples/resources/syntax/shCore.js index 1af466f9..6f8c5a22 100644 --- a/examples/resources/syntax/shCore.js +++ b/examples/resources/syntax/shCore.js @@ -120,7 +120,7 @@ var sh = { multiLineDoubleQuotedString : XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'), multiLineSingleQuotedString : XRegExp("'([^\\\\']|\\\\.)*'", 'gs'), xmlComments : XRegExp('(<|<)!--.*?--(>|>)', 'gs'), - url : /\w+:\/\/[\w-.\/?%&=:@;#]*/g, + url : /\w+:\/\/[\w-.\/?%&=:@;#,]*/g, phpScriptTags : { left: /(<|<)\?(?:=|php)?/g, right: /\?(>|>)/g, 'eof' : true }, aspScriptTags : { left: /(<|<)%=?/g, right: /%(>|>)/g }, scriptScriptTags : { left: /(<|<)\s*script.*?(>|>)/gi, right: /(<|<)\/\s*script\s*(>|>)/gi }