markdown: improved styling, and fixed nl2br extensions to only do br on new elements not inline.

- backported the code from latest markdown which we don't support.

rhodecode/lib/bleach_whitelist.py

@@ -1,408 +1,408 b''
 all_tags = [
     "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio",
     "b", "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body", "br", "button",
     "canvas", "caption", "center", "cite", "code", "col", "colgroup", "command", "content",
     "data", "datalist", "dd", "del", "detals", "dfn", "dialog", "dir", "div", "dl", "dt",
     "element", "em", "embed",
     "fieldset", "figcaption", "figure", "font", "footer", "form", "frame", "frameset",
     "h1", "h2", "h3", "h4", "h5", "h6", "head", "header", "hgroup", "hr", "html",
     "i", "iframe", "image", "img", "input", "ins", "isindex",
     "kbd", "keygen",
     "label", "legend", "li", "link", "listing",
     "main", "map", "mark", "marquee", "menu", "menuitem", "meta", "meter", "multicol",
     "nav", "nobr", "noembed", "noframes", "noscript",
     "object", "ol", "optgroup", "option", "output",
     "p", "param", "picture", "plaintext", "pre", "progress",
     "q",
     "rp", "rt", "ruby",
     "s", "samp", "script", "section", "select", "shadow", "small", "source", "spacer", "span", "strike", "strong", "style", "sub", "summary", "sup",
     "table", "tbody", "td", "template", "textarea", "tfoot", "th", "thead", "time", "title", "tr", "track", "tt",
     "u", "ul",
     "var", "video",
     "wbr",
     "xmp",
 ]
 
 # List tags that, if included in a page, could break markup or open XSS.
 generally_xss_unsafe = [
     "applet", "audio",
     "bgsound", "body",
     "canvas",
     "embed",
     "frame", "frameset",
     "head", "html",
     "iframe",
     "link",
     "meta",
     "object",
     "param",
     "source", "script",
     "ruby", "rt",
     "title", "track",
     "video",
     "xmp"
 ]
 
 # Tags that, if included on the page, will probably not break markup or open
 # XSS.  Note that these must be combined with attribute whitelisting, or things
 # like <img> and <style> could still be unsafe.
 generally_xss_safe = list(set(all_tags) - set(generally_xss_unsafe))
 generally_xss_safe.sort()
 
 # Tags suitable for rendering markdown
 markdown_tags = [
     "h1", "h2", "h3", "h4", "h5", "h6",
     "b", "i", "strong", "em", "tt",
     "p", "br",
     "span", "div", "blockquote", "code", "hr", "pre", "del",
     "ul", "ol", "li",
     "dl", "dd", "dt",
     "table", "thead", "tbody", "tfoot", "tr", "th", "td",
     "img",
     "a",
     "input",
     "details",
     "summary"
 ]
 
 markdown_attrs = {
     "*": ["class", "style", "align"],
-    "img": ["src", "alt", "title"],
+    "img": ["src", "alt", "title", "width", "height", "hspace", "align"],
     "a": ["href", "alt", "title", "name", "data-hovercard-alt", "data-hovercard-url"],
     "abbr": ["title"],
     "acronym": ["title"],
     "pre": ["lang"],
     "input": ["type", "disabled", "checked"],
     "strong": ["title", "data-hovercard-alt", "data-hovercard-url"],
 }
 
 standard_styles = [
     # Taken from https://developer.mozilla.org/en-US/docs/Web/CSS/Reference
     # This includes pseudo-classes, pseudo-elements, @-rules, units, and
     # selectors in addition to properties, but it doesn't matter for our
     # purposes -- we don't need to filter styles..
     ":active", "::after (:after)", "align-content", "align-items", "align-self",
     "all", "<angle>", "animation", "animation-delay", "animation-direction",
     "animation-duration", "animation-fill-mode", "animation-iteration-count",
     "animation-name", "animation-play-state", "animation-timing-function",
     "@annotation", "annotation()", "attr()", "::backdrop", "backface-visibility",
     "background", "background-attachment", "background-blend-mode",
     "background-clip", "background-color", "background-image", "background-origin",
     "background-position", "background-repeat", "background-size", "<basic-shape>",
     "::before (:before)", "<blend-mode>", "blur()", "border", "border-bottom",
     "border-bottom-color", "border-bottom-left-radius",
     "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
     "border-collapse", "border-color", "border-image", "border-image-outset",
     "border-image-repeat", "border-image-slice", "border-image-source",
     "border-image-width", "border-left", "border-left-color", "border-left-style",
     "border-left-width", "border-radius", "border-right", "border-right-color",
     "border-right-style", "border-right-width", "border-spacing", "border-style",
     "border-top", "border-top-color", "border-top-left-radius",
     "border-top-right-radius", "border-top-style", "border-top-width",
     "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing",
     "break-after", "break-before", "break-inside", "brightness()", "calc()",
     "caption-side", "ch", "@character-variant", "character-variant()", "@charset",
     ":checked", "circle()", "clear", "clip", "clip-path", "cm", "color", "<color>",
     "columns", "column-count", "column-fill", "column-gap", "column-rule",
     "column-rule-color", "column-rule-style", "column-rule-width", "column-span",
     "column-width", "content", "contrast()", "<counter>", "counter-increment",
     "counter-reset", "@counter-style", "cubic-bezier()", "cursor",
     "<custom-ident>", ":default", "deg", ":dir()", "direction", ":disabled",
     "display", "@document", "dpcm", "dpi", "dppx", "drop-shadow()", "element()",
     "ellipse()", "em", ":empty", "empty-cells", ":enabled", "ex", "filter",
     ":first", ":first-child", "::first-letter", "::first-line",
     ":first-of-type", "flex", "flex-basis", "flex-direction",
     "flex-flow", "flex-grow", "flex-shrink", "flex-wrap", "float", ":focus",
     "font", "@font-face", "font-family", "font-feature-settings",
     "@font-feature-values", "font-kerning", "font-language-override", "font-size",
     "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
     "font-variant", "font-variant-alternates", "font-variant-caps",
     "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
     "font-variant-position", "font-weight", "<frequency>", ":fullscreen", "grad",
     "<gradient>", "grayscale()", "grid", "grid-area", "grid-auto-columns",
     "grid-auto-flow", "grid-auto-position", "grid-auto-rows", "grid-column",
     "grid-column-start", "grid-column-end", "grid-row", "grid-row-start",
     "grid-row-end", "grid-template", "grid-template-areas", "grid-template-rows",
     "grid-template-columns", "height", ":hover", "hsl()", "hsla()", "hue-rotate()",
     "hyphens", "hz", "<image>", "image()", "image-rendering", "image-resolution",
     "image-orientation", "ime-mode", "@import", "in", ":indeterminate", "inherit",
     "initial", ":in-range", "inset()", "<integer>", ":invalid", "invert()",
     "isolation", "justify-content", "@keyframes", "khz", ":lang()", ":last-child",
     ":last-of-type", "left", ":left", "<length>", "letter-spacing",
     "linear-gradient()", "line-break", "line-height", ":link", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
     "margin-bottom", "margin-left", "margin-right", "margin-top", "marks", "mask",
     "mask-type", "matrix()", "matrix3d()", "max-height", "max-width", "@media",
     "min-height", "minmax()", "min-width", "mix-blend-mode", "mm", "ms",
     "@namespace", ":not()", ":nth-child()", ":nth-last-child()",
     ":nth-last-of-type()", ":nth-of-type()", "<number>", "object-fit",
     "object-position", ":only-child", ":only-of-type", "opacity", "opacity()",
     ":optional", "order", "@ornaments", "ornaments()", "orphans", "outline",
     "outline-color", "outline-offset", "outline-style", "outline-width",
     ":out-of-range", "overflow", "overflow-wrap", "overflow-x", "overflow-y",
     "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
     "@page", "page-break-after", "page-break-before", "page-break-inside", "pc",
     "<percentage>", "perspective", "perspective()", "perspective-origin",
     "pointer-events", "polygon()", "position", "<position>", "pt", "px", "quotes",
     "rad", "radial-gradient()", "<ratio>", ":read-only", ":read-write", "rect()",
     "rem", "repeat()", "::repeat-index", "::repeat-item",
     "repeating-linear-gradient()", "repeating-radial-gradient()", ":required",
     "resize", "<resolution>", "rgb()", "rgba()", "right", ":right", ":root",
     "rotate()", "rotatex()", "rotatey()", "rotatez()", "rotate3d()", "ruby-align",
     "ruby-merge", "ruby-position", "s", "saturate()", "scale()", "scalex()",
     "scaley()", "scalez()", "scale3d()", ":scope", "scroll-behavior",
     "::selection", "sepia()", "<shape>", "shape-image-threshold", "shape-margin",
     "shape-outside", "skew()", "skewx()", "skewy()", "steps()", "<string>",
     "@styleset", "styleset()", "@stylistic", "stylistic()", "@supports", "@swash",
     "swash()", "symbol()", "table-layout", "tab-size", ":target", "text-align",
     "text-align-last", "text-combine-upright", "text-decoration",
     "text-decoration-color", "text-decoration-line", "text-decoration-style",
     "text-indent", "text-orientation", "text-overflow", "text-rendering",
     "text-shadow", "text-transform", "text-underline-position", "<time>",
     "<timing-function>", "top", "touch-action", "transform", "transform-origin",
     "transform-style", "transition", "transition-delay", "transition-duration",
     "transition-property", "transition-timing-function", "translate()",
     "translatex()", "translatey()", "translatez()", "translate3d()", "turn",
     "unicode-bidi", "unicode-range", "unset", "<uri>", "url()", "<user-ident>",
     ":valid", "::value", "var()", "vertical-align", "vh", "@viewport",
     "visibility", ":visited", "vmax", "vmin", "vw", "white-space", "widows",
     "width", "will-change", "word-break", "word-spacing", "word-wrap",
     "writing-mode", "z-index",
 
 ]
 
 webkit_prefixed_styles = [
     # Webkit-prefixed styles
     # https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Webkit_Extensions
     "-webkit-animation", "-webkit-animation-delay", "-webkit-animation-direction",
     "-webkit-animation-duration", "-webkit-animation-fill-mode",
     "-webkit-animation-iteration-count", "-webkit-animation-name",
     "-webkit-animation-play-state", "-webkit-animation-timing-function",
     "-webkit-backface-visibility", "-webkit-border-image", "-webkit-column-count",
     "-webkit-column-gap", "-webkit-column-width", "-webkit-column-rule",
     "-webkit-column-rule-width", "-webkit-column-rule-style",
     "-webkit-column-rule-color", "-webkit-columns", "-webkit-column-span",
     "-webkit-font-feature-settings", "-webkit-font-kerning",
     "-webkit-font-size-delta", "-webkit-font-variant-ligatures",
     "-webkit-grid-column", "-webkit-grid-row", "-webkit-hyphens", "-webkit-mask",
     "-webkit-mask-clip", "-webkit-mask-composite", "-webkit-mask-image",
     "-webkit-mask-origin", "-webkit-mask-position", "-webkit-mask-repeat",
     "-webkit-mask-size", "-webkit-perspective", "-webkit-perspective-origin",
     "-webkit-region-fragment", "-webkit-shape-outside", "-webkit-text-emphasis",
     "-webkit-text-emphasis-color", "-webkit-text-emphasis-position",
     "-webkit-text-emphasis-style", "-webkit-transform", "-webkit-transform-origin",
     "-webkit-transform-style", "-webkit-transition", "-webkit-transition-delay",
     "-webkit-transition-duration", "-webkit-transition-property",
     "-webkit-transition-timing-function", "-epub-word-break", "-epub-writing-mode",
     # WebKit-prefixed properties with an unprefixed counterpart
     "-webkit-background-clip", "-webkit-background-origin",
     "-webkit-background-size", "-webkit-border-bottom-left-radius",
     "-webkit-border-bottom-right-radius", "-webkit-border-radius",
     "-webkit-border-top-left-radius", "-webkit-border-top-right-radius",
     "-webkit-box-sizing", "-epub-caption-side", "-webkit-opacity",
     "-epub-text-transform",
 ]
 
 mozilla_prefixed_styles = [
     "-moz-column-count", "-moz-column-fill", "-moz-column-gap",
     "-moz-column-width", "-moz-column-rule", "-moz-column-rule-width",
     "-moz-column-rule-style", "-moz-column-rule-color",
     "-moz-font-feature-settings", "-moz-font-language-override", "-moz-hyphens",
     "-moz-text-align-last", "-moz-text-decoration-color",
     "-moz-text-decoration-line", "-moz-text-decoration-style",
 ]
 
 all_prefixed_styles = [
     # From http://peter.sh/experiments/vendor-prefixed-css-property-overview/
     "-ms-accelerator", "-webkit-app-region", "-webkit-appearance",
     "-webkit-appearance", "-moz-appearance", "-webkit-aspect-ratio",
     "-webkit-backdrop-filter", "backface-visibility",
     "-webkit-backface-visibility", "backface-visibility", "backface-visibility",
     "-webkit-background-composite", "-webkit-background-composite", "-moz-binding",
     "-ms-block-progression", "-webkit-border-after", "-webkit-border-after",
     "-webkit-border-after-color", "-webkit-border-after-color",
     "-webkit-border-after-style", "-webkit-border-after-style",
     "-webkit-border-after-width", "-webkit-border-after-width",
     "-webkit-border-before", "-webkit-border-before",
     "-webkit-border-before-color", "-webkit-border-before-color",
     "-webkit-border-before-style", "-webkit-border-before-style",
     "-webkit-border-before-width", "-webkit-border-before-width",
     "-moz-border-bottom-colors", "-webkit-border-end", "-webkit-border-end",
     "-moz-border-end", "-webkit-border-end-color", "-webkit-border-end-color",
     "-moz-border-end-color", "-webkit-border-end-style",
     "-webkit-border-end-style", "-moz-border-end-style",
     "-webkit-border-end-width", "-webkit-border-end-width",
     "-moz-border-end-width", "-webkit-border-fit",
     "-webkit-border-horizontal-spacing", "-webkit-border-horizontal-spacing",
     "-moz-border-left-colors", "-moz-border-right-colors", "-webkit-border-start",
     "-webkit-border-start", "-moz-border-start", "-webkit-border-start-color",
     "-webkit-border-start-color", "-moz-border-start-color",
     "-webkit-border-start-style", "-webkit-border-start-style",
     "-moz-border-start-style", "-webkit-border-start-width",
     "-webkit-border-start-width", "-moz-border-start-width",
     "-moz-border-top-colors", "-webkit-border-vertical-spacing",
     "-webkit-border-vertical-spacing", "-webkit-box-align", "-webkit-box-align",
     "-moz-box-align", "-webkit-box-decoration-break",
     "-webkit-box-decoration-break", "box-decoration-break",
     "-webkit-box-direction", "-webkit-box-direction", "-moz-box-direction",
     "-webkit-box-flex", "-webkit-box-flex", "-moz-box-flex",
     "-webkit-box-flex-group", "-webkit-box-flex-group", "-webkit-box-lines",
     "-webkit-box-lines", "-webkit-box-ordinal-group", "-webkit-box-ordinal-group",
     "-moz-box-ordinal-group", "-webkit-box-orient", "-webkit-box-orient",
     "-moz-box-orient", "-webkit-box-pack", "-webkit-box-pack", "-moz-box-pack",
     "-webkit-box-reflect", "-webkit-box-reflect", "clip-path", "-webkit-clip-path",
     "clip-path", "clip-path", "-webkit-color-correction", "-webkit-column-axis",
     "-webkit-column-break-after", "-webkit-column-break-after",
     "-webkit-column-break-before", "-webkit-column-break-before",
     "-webkit-column-break-inside", "-webkit-column-break-inside",
     "-webkit-column-count", "column-count", "-moz-column-count", "column-count",
     "column-fill", "column-fill", "-moz-column-fill", "column-fill",
     "-webkit-column-gap", "column-gap", "-moz-column-gap", "column-gap",
     "-webkit-column-rule", "column-rule", "-moz-column-rule", "column-rule",
     "-webkit-column-rule-color", "column-rule-color", "-moz-column-rule-color",
     "column-rule-color", "-webkit-column-rule-style", "column-rule-style",
     "-moz-column-rule-style", "column-rule-style", "-webkit-column-rule-width",
     "column-rule-width", "-moz-column-rule-width", "column-rule-width",
     "-webkit-column-span", "column-span", "column-span", "-webkit-column-width",
     "column-width", "-moz-column-width", "column-width", "-webkit-columns",
     "columns", "-moz-columns", "columns", "-ms-content-zoom-chaining",
     "-ms-content-zoom-limit", "-ms-content-zoom-limit-max",
     "-ms-content-zoom-limit-min", "-ms-content-zoom-snap",
     "-ms-content-zoom-snap-points", "-ms-content-zoom-snap-type",
     "-ms-content-zooming", "-moz-control-character-visibility",
     "-webkit-cursor-visibility", "-webkit-dashboard-region", "filter",
     "-webkit-filter", "filter", "filter", "-ms-flex-align", "-ms-flex-item-align",
     "-ms-flex-line-pack", "-ms-flex-negative", "-ms-flex-order", "-ms-flex-pack",
     "-ms-flex-positive", "-ms-flex-preferred-size", "-moz-float-edge",
     "-webkit-flow-from", "-ms-flow-from", "-webkit-flow-into", "-ms-flow-into",
     "-webkit-font-feature-settings", "-webkit-font-feature-settings",
     "font-feature-settings", "font-feature-settings", "font-kerning",
     "-webkit-font-kerning", "font-kerning", "-webkit-font-size-delta",
     "-webkit-font-size-delta", "-webkit-font-smoothing", "-webkit-font-smoothing",
     "font-variant-ligatures", "-webkit-font-variant-ligatures",
     "font-variant-ligatures", "-moz-force-broken-image-icon", "grid",
     "-webkit-grid", "grid", "grid-area", "-webkit-grid-area", "grid-area",
     "grid-auto-columns", "-webkit-grid-auto-columns", "grid-auto-columns",
     "grid-auto-flow", "-webkit-grid-auto-flow", "grid-auto-flow", "grid-auto-rows",
     "-webkit-grid-auto-rows", "grid-auto-rows", "grid-column",
     "-webkit-grid-column", "grid-column", "-ms-grid-column",
     "-ms-grid-column-align", "grid-column-end", "-webkit-grid-column-end",
     "grid-column-end", "-ms-grid-column-span", "grid-column-start",
     "-webkit-grid-column-start", "grid-column-start", "-ms-grid-columns",
     "grid-row", "-webkit-grid-row", "grid-row", "-ms-grid-row",
     "-ms-grid-row-align", "grid-row-end", "-webkit-grid-row-end", "grid-row-end",
     "-ms-grid-row-span", "grid-row-start", "-webkit-grid-row-start",
     "grid-row-start", "-ms-grid-rows", "grid-template", "-webkit-grid-template",
     "grid-template", "grid-template-areas", "-webkit-grid-template-areas",
     "grid-template-areas", "grid-template-columns",
     "-webkit-grid-template-columns", "grid-template-columns", "grid-template-rows",
     "-webkit-grid-template-rows", "grid-template-rows", "-ms-high-contrast-adjust",
     "-webkit-highlight", "-webkit-hyphenate-character",
     "-webkit-hyphenate-character", "-webkit-hyphenate-limit-after",
     "-webkit-hyphenate-limit-before", "-ms-hyphenate-limit-chars",
     "-webkit-hyphenate-limit-lines", "-ms-hyphenate-limit-lines",
     "-ms-hyphenate-limit-zone", "-webkit-hyphens", "-moz-hyphens", "-ms-hyphens",
     "-moz-image-region", "-ms-ime-align", "-webkit-initial-letter",
     "-ms-interpolation-mode", "justify-self", "-webkit-justify-self",
     "-webkit-line-align", "-webkit-line-box-contain", "-webkit-line-box-contain",
     "-webkit-line-break", "-webkit-line-break", "line-break", "-webkit-line-clamp",
     "-webkit-line-clamp", "-webkit-line-grid", "-webkit-line-snap",
     "-webkit-locale", "-webkit-locale", "-webkit-logical-height",
     "-webkit-logical-height", "-webkit-logical-width", "-webkit-logical-width",
     "-webkit-margin-after", "-webkit-margin-after",
     "-webkit-margin-after-collapse", "-webkit-margin-after-collapse",
     "-webkit-margin-before", "-webkit-margin-before",
     "-webkit-margin-before-collapse", "-webkit-margin-before-collapse",
     "-webkit-margin-bottom-collapse", "-webkit-margin-bottom-collapse",
     "-webkit-margin-collapse", "-webkit-margin-collapse", "-webkit-margin-end",
     "-webkit-margin-end", "-moz-margin-end", "-webkit-margin-start",
     "-webkit-margin-start", "-moz-margin-start", "-webkit-margin-top-collapse",
     "-webkit-margin-top-collapse", "-webkit-marquee", "-webkit-marquee-direction",
     "-webkit-marquee-increment", "-webkit-marquee-repetition",
     "-webkit-marquee-speed", "-webkit-marquee-style", "mask", "-webkit-mask",
     "mask", "-webkit-mask-box-image", "-webkit-mask-box-image",
     "-webkit-mask-box-image-outset", "-webkit-mask-box-image-outset",
     "-webkit-mask-box-image-repeat", "-webkit-mask-box-image-repeat",
     "-webkit-mask-box-image-slice", "-webkit-mask-box-image-slice",
     "-webkit-mask-box-image-source", "-webkit-mask-box-image-source",
     "-webkit-mask-box-image-width", "-webkit-mask-box-image-width",
     "-webkit-mask-clip", "-webkit-mask-clip", "-webkit-mask-composite",
     "-webkit-mask-composite", "-webkit-mask-image", "-webkit-mask-image",
     "-webkit-mask-origin", "-webkit-mask-origin", "-webkit-mask-position",
     "-webkit-mask-position", "-webkit-mask-position-x", "-webkit-mask-position-x",
     "-webkit-mask-position-y", "-webkit-mask-position-y", "-webkit-mask-repeat",
     "-webkit-mask-repeat", "-webkit-mask-repeat-x", "-webkit-mask-repeat-x",
     "-webkit-mask-repeat-y", "-webkit-mask-repeat-y", "-webkit-mask-size",
     "-webkit-mask-size", "mask-source-type", "-webkit-mask-source-type",
     "-moz-math-display", "-moz-math-variant", "-webkit-max-logical-height",
     "-webkit-max-logical-height", "-webkit-max-logical-width",
     "-webkit-max-logical-width", "-webkit-min-logical-height",
     "-webkit-min-logical-height", "-webkit-min-logical-width",
     "-webkit-min-logical-width", "-webkit-nbsp-mode", "-moz-orient",
     "-moz-osx-font-smoothing", "-moz-outline-radius",
     "-moz-outline-radius-bottomleft", "-moz-outline-radius-bottomright",
     "-moz-outline-radius-topleft", "-moz-outline-radius-topright",
     "-webkit-overflow-scrolling", "-ms-overflow-style", "-webkit-padding-after",
     "-webkit-padding-after", "-webkit-padding-before", "-webkit-padding-before",
     "-webkit-padding-end", "-webkit-padding-end", "-moz-padding-end",
     "-webkit-padding-start", "-webkit-padding-start", "-moz-padding-start",
     "perspective", "-webkit-perspective", "perspective", "perspective",
     "perspective-origin", "-webkit-perspective-origin", "perspective-origin",
     "perspective-origin", "-webkit-perspective-origin-x",
     "-webkit-perspective-origin-x", "perspective-origin-x",
     "-webkit-perspective-origin-y", "-webkit-perspective-origin-y",
     "perspective-origin-y", "-webkit-print-color-adjust",
     "-webkit-print-color-adjust", "-webkit-region-break-after",
     "-webkit-region-break-before", "-webkit-region-break-inside",
     "-webkit-region-fragment", "-webkit-rtl-ordering", "-webkit-rtl-ordering",
     "-webkit-ruby-position", "-webkit-ruby-position", "ruby-position",
     "-moz-script-level", "-moz-script-min-size", "-moz-script-size-multiplier",
     "-ms-scroll-chaining", "-ms-scroll-limit", "-ms-scroll-limit-x-max",
     "-ms-scroll-limit-x-min", "-ms-scroll-limit-y-max", "-ms-scroll-limit-y-min",
     "-ms-scroll-rails", "-webkit-scroll-snap-coordinate",
     "-webkit-scroll-snap-destination", "-webkit-scroll-snap-points-x",
     "-ms-scroll-snap-points-x", "-webkit-scroll-snap-points-y",
     "-ms-scroll-snap-points-y", "-webkit-scroll-snap-type", "-ms-scroll-snap-type",
     "-ms-scroll-snap-x", "-ms-scroll-snap-y", "-ms-scroll-translation",
     "-ms-scrollbar-3dlight-color", "shape-image-threshold",
     "-webkit-shape-image-threshold", "shape-margin", "-webkit-shape-margin",
     "shape-outside", "-webkit-shape-outside", "-moz-stack-sizing", "tab-size",
     "tab-size", "-moz-tab-size", "-webkit-tap-highlight-color",
     "-webkit-tap-highlight-color", "text-align-last", "-webkit-text-align-last",
     "-moz-text-align-last", "text-align-last", "-webkit-text-combine",
     "-webkit-text-combine", "-ms-text-combine-horizontal", "text-decoration-color",
     "-webkit-text-decoration-color", "text-decoration-color",
     "text-decoration-color", "text-decoration-line",
     "-webkit-text-decoration-line", "text-decoration-line",
     "-webkit-text-decoration-skip", "text-decoration-style",
     "-webkit-text-decoration-style", "text-decoration-style",
     "-webkit-text-decorations-in-effect", "-webkit-text-decorations-in-effect",
     "-webkit-text-emphasis", "text-emphasis", "-webkit-text-emphasis-color",
     "text-emphasis-color", "-webkit-text-emphasis-position",
     "text-emphasis-position", "-webkit-text-emphasis-style", "text-emphasis-style",
     "-webkit-text-fill-color", "-webkit-text-fill-color", "text-justify",
     "-webkit-text-justify", "text-justify", "-webkit-text-orientation",
     "-webkit-text-orientation", "text-orientation", "-webkit-text-security",
     "-webkit-text-security", "-webkit-text-size-adjust", "-moz-text-size-adjust",
     "-ms-text-size-adjust", "-webkit-text-stroke", "-webkit-text-stroke",
     "-webkit-text-stroke-color", "-webkit-text-stroke-color",
     "-webkit-text-stroke-width", "-webkit-text-stroke-width",
     "text-underline-position", "-webkit-text-underline-position",
     "text-underline-position", "-webkit-touch-callout", "-ms-touch-select",
     "transform", "-webkit-transform", "transform", "transform", "transform-origin",
     "-webkit-transform-origin", "transform-origin", "transform-origin",
     "-webkit-transform-origin-x", "-webkit-transform-origin-x",
     "transform-origin-x", "-webkit-transform-origin-y",
     "-webkit-transform-origin-y", "transform-origin-y",
     "-webkit-transform-origin-z", "-webkit-transform-origin-z",
     "transform-origin-z", "transform-style", "-webkit-transform-style",
     "transform-style", "transform-style", "-webkit-user-drag", "-webkit-user-drag",
     "-moz-user-focus", "-moz-user-input", "-webkit-user-modify",
     "-webkit-user-modify", "-moz-user-modify", "-webkit-user-select",
     "-webkit-user-select", "-moz-user-select", "-ms-user-select",
     "-moz-window-dragging", "-moz-window-shadow", "-ms-wrap-flow",
     "-ms-wrap-margin", "-ms-wrap-through", "writing-mode", "-webkit-writing-mode",
     "writing-mode", "writing-mode",
 ]
 
 all_styles = standard_styles + all_prefixed_styles
  No newline at end of file

rhodecode/lib/markdown_ext.py

@@ -1,110 +1,178 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import re
 import markdown
+import xml.etree.ElementTree as etree
 
 from markdown.extensions import Extension
 from markdown.extensions.fenced_code import FencedCodeExtension
 from markdown.extensions.smart_strong import SmartEmphasisExtension
 from markdown.extensions.tables import TableExtension
-from markdown.extensions.nl2br import Nl2BrExtension
+from markdown.inlinepatterns import Pattern
 
 import gfm
 
 
+class InlineProcessor(Pattern):
+    """
+    Base class that inline patterns subclass.
+    This is the newer style inline processor that uses a more
+    efficient and flexible search approach.
+    """
+
+    def __init__(self, pattern, md=None):
+        """
+        Create an instant of an inline pattern.
+        Keyword arguments:
+        * pattern: A regular expression that matches a pattern
+        """
+        self.pattern = pattern
+        self.compiled_re = re.compile(pattern, re.DOTALL | re.UNICODE)
+
+        # Api for Markdown to pass safe_mode into instance
+        self.safe_mode = False
+        self.md = md
+
+    def handleMatch(self, m, data):
+        """Return a ElementTree element from the given match and the
+        start and end index of the matched text.
+        If `start` and/or `end` are returned as `None`, it will be
+        assumed that the processor did not find a valid region of text.
+        Subclasses should override this method.
+        Keyword arguments:
+        * m: A re match object containing a match of the pattern.
+        * data: The buffer current under analysis
+        Returns:
+        * el: The ElementTree element, text or None.
+        * start: The start of the region that has been matched or None.
+        * end: The end of the region that has been matched or None.
+        """
+        pass  # pragma: no cover
+
+
+class SimpleTagInlineProcessor(InlineProcessor):
+    """
+    Return element of type `tag` with a text attribute of group(2)
+    of a Pattern.
+    """
+    def __init__(self, pattern, tag):
+        InlineProcessor.__init__(self, pattern)
+        self.tag = tag
+
+    def handleMatch(self, m, data):  # pragma: no cover
+        el = etree.Element(self.tag)
+        el.text = m.group(2)
+        return el, m.start(0), m.end(0)
+
+
+class SubstituteTagInlineProcessor(SimpleTagInlineProcessor):
+    """ Return an element of type `tag` with no children. """
+    def handleMatch(self, m, data):
+        return etree.Element(self.tag), m.start(0), m.end(0)
+
+
+class Nl2BrExtension(Extension):
+    BR_RE = r'\n'
+
+    def extendMarkdown(self, md, md_globals):
+        br_tag = SubstituteTagInlineProcessor(self.BR_RE, 'br')
+        md.inlinePatterns.add('nl', br_tag, '_end')
+
+
 class GithubFlavoredMarkdownExtension(Extension):
     """
     An extension that is as compatible as possible with GitHub-flavored
     Markdown (GFM).
 
     This extension aims to be compatible with the variant of GFM that GitHub
     uses for Markdown-formatted gists and files (including READMEs). This
     variant seems to have all the extensions described in the `GFM
     documentation`_, except:
 
     - Newlines in paragraphs are not transformed into ``br`` tags.
     - Intra-GitHub links to commits, repositories, and issues are not
       supported.
 
     If you need support for features specific to GitHub comments and issues,
     please use :class:`mdx_gfm.GithubFlavoredMarkdownExtension`.
 
     .. _GFM documentation: https://guides.github.com/features/mastering-markdown/
     """
 
     def extendMarkdown(self, md, md_globals):
         # Built-in extensions
+        Nl2BrExtension().extendMarkdown(md, md_globals)
         FencedCodeExtension().extendMarkdown(md, md_globals)
         SmartEmphasisExtension().extendMarkdown(md, md_globals)
         TableExtension().extendMarkdown(md, md_globals)
 
         # Custom extensions
         gfm.AutolinkExtension().extendMarkdown(md, md_globals)
         gfm.AutomailExtension().extendMarkdown(md, md_globals)
         gfm.HiddenHiliteExtension([
             ('guess_lang', 'False'),
             ('css_class', 'highlight')
         ]).extendMarkdown(md, md_globals)
         gfm.SemiSaneListExtension().extendMarkdown(md, md_globals)
         gfm.SpacedLinkExtension().extendMarkdown(md, md_globals)
         gfm.StrikethroughExtension().extendMarkdown(md, md_globals)
         gfm.TaskListExtension([
             ('list_attrs', {'class': 'checkbox'})
         ]).extendMarkdown(md, md_globals)
-        Nl2BrExtension().extendMarkdown(md, md_globals)
 
 
 # Global Vars
 URLIZE_RE = '(%s)' % '|'.join([
     r'<(?:f|ht)tps?://[^>]*>',
     r'\b(?:f|ht)tps?://[^)<>\s]+[^.,)<>\s]',
     r'\bwww\.[^)<>\s]+[^.,)<>\s]',
     r'[^(<\s]+\.(?:com|net|org)\b',
 ])
 
 
 class UrlizePattern(markdown.inlinepatterns.Pattern):
     """ Return a link Element given an autolink (`http://example/com`). """
     def handleMatch(self, m):
         url = m.group(2)
 
         if url.startswith('<'):
             url = url[1:-1]
 
         text = url
 
         if not url.split('://')[0] in ('http','https','ftp'):
             if '@' in url and not '/' in url:
                 url = 'mailto:' + url
             else:
                 url = 'http://' + url
 
         el = markdown.util.etree.Element("a")
         el.set('href', url)
         el.text = markdown.util.AtomicString(text)
         return el
 
 
 class UrlizeExtension(markdown.Extension):
     """ Urlize Extension for Python-Markdown. """
 
     def extendMarkdown(self, md, md_globals):
         """ Replace autolink with UrlizePattern """
         md.inlinePatterns['autolink'] = UrlizePattern(URLIZE_RE, md)

rhodecode/public/css/legacy_code_styles.less

@@ -1,400 +1,406 b''
 
 /** MODAL **/
 .modal-open {
   overflow:hidden;
 }
 body.modal-open, .modal-open .navbar-fixed-top, .modal-open .navbar-fixed-bottom {
   margin-right:15px;
 }
 .modal {
   position:fixed;
   top:0;
   right:0;
   bottom:0;
   left:0;
   z-index:1040;
   display:none;
   overflow-y:scroll;
 	&.fade .modal-dialog {
  		-webkit-transform:translate(0,-25%);
  		-ms-transform:translate(0,-25%);
  		transform:translate(0,-25%);
  		-webkit-transition:-webkit-transform 0.3s ease-out;
  		-moz-transition:-moz-transform 0.3s ease-out;
  		-o-transition:-o-transform 0.3s ease-out;
  		transition:transform 0.3s ease-out;
 	}
 	&.in .modal-dialog {
 		-webkit-transform:translate(0,0);
 		-ms-transform:translate(0,0);
 		transform:translate(0,0);
 	}
 }
 .modal-dialog {
   z-index:1050;
   width:auto;
   padding:10px;
   margin-right:auto;
   margin-left:auto;
 }
 .modal-content {
   position:relative;
   background-color:#ffffff;
   border: @border-thickness solid rgba(0,0,0,0.2);
   .border-radius(@border-radius);
   outline:none;
   -webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);
   box-shadow:0 3px 9px rgba(0,0,0,0.5);
   background-clip:padding-box;
 }
 .modal-backdrop {
   position:fixed;
   top:0;
   right:0;
   bottom:0;
   left:0;
   z-index:1030;
   background-color:#000000;
 
 	&.modal-backdrop.fade {
 		opacity:0;
 		filter:alpha(opacity=0);
 	}
 	&.in {
 		opacity:0.5;
 		filter:alpha(opacity=50);
 	}
 }
 .modal-header {
   min-height:16.428571429px;
   padding:15px;
   border-bottom: @border-thickness solid @grey6;
   .close {
     margin-top:-2px;
   }
 }
 .modal-title {
   margin:0;
   line-height:1.428571429;
 }
 .modal-body {
   position:relative;
   padding:20px;
 }
 .modal-footer {
   padding:19px 20px 20px;
   margin-top:15px;
   text-align:right;
   border-top:1px solid #e5e5e5;
   .btn + .btn {
     margin-bottom:0;
     margin-left:5px;
   }
   .btn-group .btn + .btn {
     margin-left:-1px;
   }
   .btn-block + .btn-block {
     margin-left:0;
   }
 	&:before {
 		display:table;
 		content:" ";
 	}
 	&:after {
 		display:table;
 		content:" ";
 		clear:both;
 	}
 }
 
 /** MARKDOWN styling **/
 div.markdown-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 3px 15px 3px;
 }
 
 div.markdown-block h1,
 div.markdown-block h2,
 div.markdown-block h3,
 div.markdown-block h4,
 div.markdown-block h5,
 div.markdown-block h6 {
     border-bottom: none !important;
     padding: 0 !important;
     overflow: visible !important;
 }
 
 div.markdown-block h1,
 div.markdown-block h2 {
     border-bottom: 1px #e6e5e5 solid !important;
 }
 
 div.markdown-block h1 {
     font-size: 32px;
     margin: 15px 0 15px 0 !important;
 }
 
 div.markdown-block h2 {
     font-size: 24px !important;
     margin: 34px 0 10px 0 !important;
 }
 
 div.markdown-block h3 {
     font-size: 18px !important;
     margin: 30px 0 8px 0 !important;
     padding-bottom: 2px !important;
 }
 
 div.markdown-block h4 {
     font-size: 13px !important;
     margin: 18px 0 3px 0 !important;
 }
 
 div.markdown-block h5 {
     font-size: 12px !important;
     margin: 15px 0 3px 0 !important;
 }
 
 div.markdown-block h6 {
     font-size: 12px;
     color: #777777;
     margin: 15px 0 3px 0 !important;
 }
 
 div.markdown-block hr {
     border: 0;
     color: #e6e5e5;
     background-color: #e6e5e5;
     height: 3px;
     margin-bottom: 13px;
 }
 
 div.markdown-block blockquote {
   color: #424242 !important;
   padding: 8px 21px;
   margin: 12px 0;
   border-left: 4px solid @grey6;
 }
 
 div.markdown-block blockquote p {
   color: #424242 !important;
   padding: 0 !important;
   margin: 0 !important;
   line-height: 1.5;
 }
 
 
 div.markdown-block ol,
 div.markdown-block ul,
 div.markdown-block p,
 div.markdown-block blockquote,
 div.markdown-block dl,
 div.markdown-block li,
 div.markdown-block table {
     color: #424242 !important;
     font-size: 13px !important;
     font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
 }
 
 div.markdown-block pre {
   margin: 3px 0px 13px 0px !important;
   padding: .5em;
   color: #424242 !important;
   font-size: 13px !important;
   overflow: visible !important;
   line-height: 140% !important;
   background-color: @grey7;
 }
 
 div.markdown-block img {
   border-style: none;
   background-color: #fff;
-  padding-right: 20px;
   max-width: 100%;
 }
 
 
 div.markdown-block strong {
   font-weight: 600;
   margin: 0;
 }
 
 div.markdown-block ul.checkbox,
 div.markdown-block ol.checkbox {
     padding-left: 20px !important;
     margin-top: 0px !important;
     margin-bottom: 18px !important;
 }
 
 div.markdown-block ul,
 div.markdown-block ol {
     padding-left: 30px !important;
     margin-top: 0px !important;
     margin-bottom: 18px !important;
 }
 
 div.markdown-block ul.checkbox li,
 div.markdown-block ol.checkbox li {
     list-style: none !important;
     margin: 0px !important;
     padding: 0 !important;
 }
 
 div.markdown-block ul li,
 div.markdown-block ol li {
     list-style: disc !important;
     margin: 0px !important;
     padding: 0 !important;
 }
 
 div.markdown-block ol li {
     list-style: decimal !important;
 }
 
 
 div.markdown-block #message {
     .border-radius(@border-radius);
     border: @border-thickness solid @grey5;
     display: block;
     width: 100%;
     height: 60px;
     margin: 6px 0px;
 }
 
 div.markdown-block button,
 div.markdown-block #ws {
     font-size: @basefontsize;
     padding: 4px 6px;
     .border-radius(@border-radius);
     border: @border-thickness solid @grey5;
     background-color: @grey6;
 }
 
+div.markdown-block p {
+    margin-top: 0;
+    margin-bottom: 16px;
+    padding: 0;
+    line-height: unset;
+}
+
 div.markdown-block code,
 div.markdown-block pre,
 div.markdown-block #ws,
 div.markdown-block #message {
     font-family: @text-monospace;
     font-size: 11px;
     .border-radius(@border-radius);
     background-color: white;
     color: @grey3;
 }
 
 
 div.markdown-block code {
     border: @border-thickness solid @grey6;
     margin: 0 2px;
     padding: 0 5px;
 }
 
 div.markdown-block pre {
     border: @border-thickness solid @grey5;
     overflow: auto;
     padding: .5em;
     background-color: @grey7;
 }
 
 div.markdown-block pre > code {
     border: 0;
     margin: 0;
     padding: 0;
 }
 
 /** RST STYLE **/
 div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 3px 15px 3px;
 }
 
 div.rst-block h2 {
     font-weight: normal;
 }
 
 div.rst-block  h1,
 div.rst-block  h2,
 div.rst-block  h3,
 div.rst-block  h4,
 div.rst-block  h5,
 div.rst-block  h6 {
     border-bottom: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     line-height: 1.5em !important;
 }
 
 
 div.rst-block  h1:first-child {
     padding-top: .25em !important;
 }
 
 div.rst-block  h2,
 div.rst-block  h3 {
     margin: 1em 0 !important;
 }
 
 div.rst-block  h1,
 div.rst-block  h2 {
     border-bottom: 1px #e6e5e5 solid !important;
 }
 
 div.rst-block  h2 {
     margin-top: 1.5em !important;
     padding-top: .5em !important;
 }
 
 div.rst-block  p {
     color: black !important;
     margin: 1em 0 !important;
     line-height: 1.5em !important;
 }
 
 div.rst-block  ul {
     list-style: disc !important;
     margin: 1em 0 1em 2em !important;
     clear: both;
 }
 
 div.rst-block  ol {
     list-style: decimal;
     margin: 1em 0 1em 2em !important;
 }
 
 div.rst-block pre,
 div.rst-block code {
     font: 12px "Bitstream Vera Sans Mono","Courier",monospace;
 }
 
 div.rst-block code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
 }
 
 div.rst-block pre code {
     padding: 0 !important;
     font-size: 12px !important;
     background-color: #eee !important;
     border: none !important;
 }
 
 div.rst-block pre {
     margin: 1em 0;
     padding: @padding;
     border: 1px solid @grey6;
     .border-radius(@border-radius);
     overflow: auto;
     font-size: 12px;
     color: #444;
     background-color: @grey7;
 }
 
 

rhodecode/public/css/readme-box.less

@@ -1,279 +1,284 b''
 /** README styling **/
 
 .readme-title {
     border: 1px solid @grey6;
     padding: 10px 5px;
     margin-top: 30px;
     margin-bottom: -1px;
 
     a {
         font-weight: 600;
         font-size: 13px
     }
 }
 
 div.readme_box {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 3px 15px 3px;
 }
 
 div.readme_box h1,
 div.readme_box h2,
 div.readme_box h3,
 div.readme_box h4,
 div.readme_box h5,
 div.readme_box h6 {
     border-bottom: none !important;
     padding: 0 !important;
     overflow: visible !important;
 }
 
 div.readme_box h1,
 div.readme_box h2 {
     border-bottom: 1px #e6e5e5 solid !important;
 }
 
 div.readme_box h1 {
     font-size: 32px;
     margin: 15px 0 15px 0 !important;
 }
 
 div.readme_box h2 {
     font-size: 24px !important;
     margin: 34px 0 10px 0 !important;
 }
 
 div.readme_box h3 {
     font-size: 18px !important;
     margin: 30px 0 8px 0 !important;
     padding-bottom: 2px !important;
 }
 
 div.readme_box h4 {
     font-size: 13px !important;
     margin: 18px 0 3px 0 !important;
 }
 
 div.readme_box h5 {
     font-size: 12px !important;
     margin: 15px 0 3px 0 !important;
 }
 
 div.readme_box h6 {
     font-size: 12px;
     color: #777777;
     margin: 15px 0 3px 0 !important;
 }
 
 div.readme_box hr {
     border: 0;
     color: #e6e5e5;
     background-color: #e6e5e5;
     height: 3px;
     margin-bottom: 13px;
 }
 
 div.readme_box blockquote {
   color: #424242 !important;
   padding: 8px 21px;
   margin: 12px 0;
   border-left: 4px solid @grey6;
 }
 
 div.readme_box blockquote p {
   color: #424242 !important;
   padding: 0 !important;
   margin: 0 !important;
   line-height: 1.5;
 }
 
 div.readme_box ol,
 div.readme_box ul,
 div.readme_box p,
 div.readme_box blockquote,
 div.readme_box dl,
 div.readme_box li,
 div.readme_box table {
     color: #424242 !important;
     font-size: 13px !important;
     font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
 }
 
 div.readme_box pre {
   margin: 3px 0px 13px 0px !important;
   padding: .5em;
   color: #424242 !important;
   font-size: 13px !important;
   overflow: visible !important;
   line-height: 140% !important;
 }
 
 div.readme_box img {
   border-style: none;
   background-color: #fff;
-  padding-right: 20px;
   max-width: 100%;
 }
 
-
 div.readme_box strong {
   font-weight: 600;
   margin: 0;
 }
 
 div.readme_box ul,
 div.readme_box ol {
     padding-left: 30px !important;
     margin-top: 0px !important;
     margin-bottom: 18px !important;
 }
 
 div.readme_box ul li,
 div.readme_box ol li {
     list-style: disc !important;
     margin: 6px !important;
     padding: 0 !important;
 }
 
 div.readme_box ol li {
     list-style: decimal !important;
 }
 
 /*
 div.readme_box a,
 div.readme_box a:visited {
     color: #4183C4 !important;
     background-color: inherit;
     text-decoration: none;
 }
 */
 
+div.readme_box p {
+    margin-top: 0;
+    margin-bottom: 16px;
+    padding: 0;
+    line-height: unset;
+}
+
 
 div.readme_box button {
     font-size: @basefontsize;
     padding: 4px 6px;
     .border-radius(@border-radius);
     border: @border-thickness solid @grey5;
     background-color: @grey6;
 }
 
 div.readme_box code,
 div.readme_box pre {
     font-family: @text-monospace;
     font-size: 11px;
     .border-radius(@border-radius);
     background-color: white;
     color: @grey3;
 }
 
 
 div.readme_box code {
     border: @border-thickness solid @grey6;
     margin: 0 2px;
     padding: 0 5px;
 }
 
 div.readme_box pre {
     border: @border-thickness solid #CBDBEB;
     overflow: auto;
     padding: .5em;
     background-color: #FCFEFF;
 }
 
 div.readme_box pre > code {
     border: 0;
     margin: 0;
     padding: 0;
 }
 
 /** RST STYLE **/
 div.rst-block {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 3px 15px 3px;
 }
 
 div.rst-block h2 {
     font-weight: normal;
 }
 
 div.rst-block  h1,
 div.rst-block  h2,
 div.rst-block  h3,
 div.rst-block  h4,
 div.rst-block  h5,
 div.rst-block  h6 {
     border-bottom: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
     line-height: 1.5em !important;
 }
 
 
 div.rst-block  h1:first-child {
     padding-top: .25em !important;
 }
 
 div.rst-block  h2,
 div.rst-block  h3 {
     margin: 1em 0 !important;
 }
 
 div.rst-block  h2 {
     margin-top: 1.5em !important;
     border-top: 4px solid #e0e0e0 !important;
     padding-top: .5em !important;
 }
 
 div.rst-block  p {
     color: black !important;
     margin: 1em 0 !important;
     line-height: 1.5em !important;
 }
 
 div.rst-block  ul {
     list-style: disc !important;
     margin: 1em 0 1em 2em !important;
     clear: both;
 }
 
 div.rst-block  ol {
     list-style: decimal;
     margin: 1em 0 1em 2em !important;
 }
 
 div.rst-block pre,
 div.rst-block code {
     font: 12px "Bitstream Vera Sans Mono","Courier",monospace;
 }
 
 div.rst-block code {
     font-size: 12px !important;
     background-color: ghostWhite !important;
     color: #444 !important;
     padding: 0 .2em !important;
     border: 1px solid #dedede !important;
 }
 
 div.rst-block pre code {
     padding: 0 !important;
     font-size: 12px !important;
     background-color: #eee !important;
     border: none !important;
 }
 
 div.rst-block pre {
     margin: 1em 0;
     padding: @padding;
     border: 1px solid @grey6;
     .border-radius(@border-radius);
     overflow: auto;
     font-size: 12px;
     color: #444;
     background-color: @grey7;
 }
  No newline at end of file

rhodecode/templates/email_templates/base.mako

@@ -1,639 +1,645 b''
 ## -*- coding: utf-8 -*-
 
 ## helpers
 <%def name="tag_button(text, tag_type=None)">
 <%
 color_scheme = {
     'default': 'border:1px solid #979797;color:#666666;background-color:#f9f9f9',
     'approved': 'border:1px solid #0ac878;color:#0ac878;background-color:#f9f9f9',
     'rejected': 'border:1px solid #e85e4d;color:#e85e4d;background-color:#f9f9f9',
     'under_review': 'border:1px solid #ffc854;color:#ffc854;background-color:#f9f9f9',
 }
 
 css_style = ';'.join([
     'display:inline',
     'border-radius:2px',
     'font-size:12px',
     'padding:.2em',
 ])
 
 %>
     <pre style="${css_style}; ${color_scheme.get(tag_type, color_scheme['default'])}">${text}</pre>
 </%def>
 
 <%def name="status_text(text, tag_type=None)">
     <%
     color_scheme = {
         'default': 'color:#666666',
         'approved': 'color:#0ac878',
         'rejected': 'color:#e85e4d',
         'under_review': 'color:#ffc854',
     }
     %>
     <span style="font-weight:bold;font-size:12px;padding:.2em;${color_scheme.get(tag_type, color_scheme['default'])}">${text}</span>
 </%def>
 
 <%def name="gravatar_img(email, size=16)">
 <%
 css_style = ';'.join([
     'padding: 0',
     'margin: -4px 0',
     'border-radius: 50%',
     'box-sizing: content-box',
     'display: inline',
     'line-height: 1em',
     'min-width: 16px',
     'min-height: 16px',
 ])
 %>
 
 <img alt="gravatar" style="${css_style}" src="${h.gravatar_url(email, size)}" height="${size}" width="${size}">
 </%def>
 
 <%def name="link_css()">\
 <%
 css_style = ';'.join([
     'color:#427cc9',
     'text-decoration:none',
     'cursor:pointer'
 ])
 %>\
 ${css_style}\
 </%def>
 
 ## Constants
 <%
 text_regular = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, sans-serif"
 text_monospace = "'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace"
 
 %>
 
 <%def name="plaintext_footer()" filter="trim">
 ${_('This is a notification from RhodeCode.')} ${instance_url}
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
 ## this example is not called itself but overridden in each template
 ## the plaintext_footer should be at the bottom of both html and text emails
 ${self.plaintext_footer()}
 </%def>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>${self.subject()}</title>
     <style type="text/css">
         /* Based on The MailChimp Reset INLINE: Yes. */
         #outlook a {
             padding: 0;
         }
 
         /* Force Outlook to provide a "view in browser" menu link. */
         body {
             width: 100% !important;
             -webkit-text-size-adjust: 100%;
             -ms-text-size-adjust: 100%;
             margin: 0;
             padding: 0;
             font-family: ${text_regular|n};
             color: #000000;
         }
 
         /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
         .ExternalClass {
             width: 100%;
         }
 
         /* Force Hotmail to display emails at full width */
         .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {
             line-height: 100%;
         }
 
         /* Forces Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */
         #backgroundTable {
             margin: 0;
             padding: 0;
             line-height: 100% !important;
         }
 
         /* End reset */
 
         /* defaults for images*/
         img {
             outline: none;
             text-decoration: none;
             -ms-interpolation-mode: bicubic;
         }
 
         a img {
             border: none;
         }
 
         .image_fix {
             display: block;
         }
 
         body {
             line-height: 1.2em;
         }
 
         p {
             margin: 0 0 20px;
         }
 
         h1, h2, h3, h4, h5, h6 {
             color: #323232 !important;
         }
 
         a {
             color: #427cc9;
             text-decoration: none;
             outline: none;
             cursor: pointer;
         }
 
         a:focus {
             outline: none;
         }
 
         a:hover {
             color: #305b91;
         }
 
         h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
             color: #427cc9 !important;
             text-decoration: none !important;
         }
 
         h1 a:active, h2 a:active, h3 a:active, h4 a:active, h5 a:active, h6 a:active {
             color: #305b91 !important;
         }
 
         h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {
             color: #305b91 !important;
         }
 
         table {
             font-size: 13px;
             border-collapse: collapse;
             mso-table-lspace: 0pt;
             mso-table-rspace: 0pt;
         }
 
         table tr {
             display: table-row;
             vertical-align: inherit;
             border-color: inherit;
             border-spacing: 0 3px;
         }
 
         table td {
             padding: .65em 1em .65em 0;
             border-collapse: collapse;
             vertical-align: top;
             text-align: left;
         }
 
         input {
             display: inline;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             padding: .5em;
         }
 
         input:focus {
             outline: 1px solid #979797
         }
 
         code {
             font-family: ${text_monospace|n};
             white-space: pre-line !important;
             color: #000000;
         }
 
         ul.changes-ul {
             list-style: none;
             list-style-type: none;
             padding: 0;
             margin: 10px 0;
         }
         ul.changes-ul li {
             list-style: none;
             list-style-type: none;
             margin: 2px 0;
         }
 
         @media only screen and (-webkit-min-device-pixel-ratio: 2) {
             /* Put your iPhone 4g styles in here */
         }
 
         /* Android targeting */
         @media only screen and (-webkit-device-pixel-ratio:.75){
         /* Put CSS for low density (ldpi) Android layouts in here */
         }
         @media only screen and (-webkit-device-pixel-ratio:1){
         /* Put CSS for medium density (mdpi) Android layouts in here */
         }
         @media only screen and (-webkit-device-pixel-ratio:1.5){
         /* Put CSS for high density (hdpi) Android layouts in here */
         }
         /* end Android targeting */
 
         /** MARKDOWN styling **/
         div.markdown-block {
             clear: both;
             overflow: hidden;
             margin: 0;
             padding: 3px 5px 3px
         }
 
         div.markdown-block h1,
         div.markdown-block h2,
         div.markdown-block h3,
         div.markdown-block h4,
         div.markdown-block h5,
         div.markdown-block h6 {
             border-bottom: none !important;
             padding: 0 !important;
             overflow: visible !important
         }
 
         div.markdown-block h1,
         div.markdown-block h2 {
             border-bottom: 1px #e6e5e5 solid !important
         }
 
         div.markdown-block h1 {
             font-size: 32px;
             margin: 15px 0 15px 0 !important;
             padding-bottom: 5px !important
         }
 
         div.markdown-block h2 {
             font-size: 24px !important;
             margin: 34px 0 10px 0 !important;
             padding-top: 15px !important;
             padding-bottom: 8px !important
         }
 
         div.markdown-block h3 {
             font-size: 18px !important;
             margin: 30px 0 8px 0 !important;
             padding-bottom: 2px !important
         }
 
         div.markdown-block h4 {
             font-size: 13px !important;
             margin: 18px 0 3px 0 !important
         }
 
         div.markdown-block h5 {
             font-size: 12px !important;
             margin: 15px 0 3px 0 !important
         }
 
         div.markdown-block h6 {
             font-size: 12px;
             color: #777777;
             margin: 15px 0 3px 0 !important
         }
 
         div.markdown-block hr {
             border: 0;
             color: #e6e5e5;
             background-color: #e6e5e5;
             height: 3px;
             margin-bottom: 13px
         }
 
         div.markdown-block ol,
         div.markdown-block ul,
         div.markdown-block p,
         div.markdown-block blockquote,
         div.markdown-block dl,
         div.markdown-block li,
         div.markdown-block table {
             margin: 3px 0 13px 0 !important;
             color: #424242 !important;
             font-size: 13px !important;
             font-family: ${text_regular|n};
             font-weight: normal !important;
             overflow: visible !important;
             line-height: 140% !important
         }
 
         div.markdown-block pre {
             margin: 3px 0 13px 0 !important;
             padding: .5em;
             color: #424242 !important;
             font-size: 13px !important;
             overflow: visible !important;
             line-height: 140% !important;
             background-color: #F5F5F5
         }
 
         div.markdown-block img {
             border-style: none;
             background-color: #fff;
-            padding-right: 20px;
             max-width: 100%
         }
 
         div.markdown-block strong {
             font-weight: 600;
             margin: 0
         }
 
         div.markdown-block ul.checkbox, div.markdown-block ol.checkbox {
             padding-left: 20px !important;
             margin-top: 0 !important;
             margin-bottom: 18px !important
         }
 
         div.markdown-block ul, div.markdown-block ol {
             padding-left: 30px !important;
             margin-top: 0 !important;
             margin-bottom: 18px !important
         }
 
         div.markdown-block ul.checkbox li, div.markdown-block ol.checkbox li {
             list-style: none !important;
             margin: 0px !important;
             padding: 0 !important
         }
 
         div.markdown-block ul li, div.markdown-block ol li {
             list-style: disc !important;
             margin: 0px !important;
             padding: 0 !important
         }
 
         div.markdown-block ol li {
             list-style: decimal !important
         }
 
         div.markdown-block #message {
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             display: block;
             width: 100%;
             height: 60px;
             margin: 6px 0
         }
 
         div.markdown-block button, div.markdown-block #ws {
             font-size: 13px;
             padding: 4px 6px;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             border: 1px solid #dbd9da;
             background-color: #eeeeee
         }
 
+        div.markdown-block p {
+            margin-top: 0;
+            margin-bottom: 16px;
+            padding: 0;
+            line-height: unset;
+        }
+
         div.markdown-block code,
         div.markdown-block pre,
         div.markdown-block #ws,
         div.markdown-block #message {
             font-family: ${text_monospace|n};
             font-size: 11px;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             background-color: #FFFFFF;
             color: #7E7F7F
         }
 
         div.markdown-block code {
             border: 1px solid #7E7F7F;
             margin: 0 2px;
             padding: 0 5px
         }
 
         div.markdown-block pre {
             border: 1px solid #7E7F7F;
             overflow: auto;
             padding: .5em;
             background-color: #FFFFFF;
         }
 
         div.markdown-block pre > code {
             border: 0;
             margin: 0;
             padding: 0
         }
 
         div.rst-block {
             clear: both;
             overflow: hidden;
             margin: 0;
             padding: 3px 5px 3px
         }
 
         div.rst-block h2 {
             font-weight: normal
         }
 
         div.rst-block h1,
         div.rst-block h2,
         div.rst-block h3,
         div.rst-block h4,
         div.rst-block h5,
         div.rst-block h6 {
             border-bottom: 0 !important;
             margin: 0 !important;
             padding: 0 !important;
             line-height: 1.5em !important
         }
 
         div.rst-block h1:first-child {
             padding-top: .25em !important
         }
 
         div.rst-block h2, div.rst-block h3 {
             margin: 1em 0 !important
         }
 
         div.rst-block h1, div.rst-block h2 {
             border-bottom: 1px #e6e5e5 solid !important
         }
 
         div.rst-block h2 {
             margin-top: 1.5em !important;
             padding-top: .5em !important
         }
 
         div.rst-block p {
             color: black !important;
             margin: 1em 0 !important;
             line-height: 1.5em !important
         }
 
         div.rst-block ul {
             list-style: disc !important;
             margin: 1em 0 1em 2em !important;
             clear: both
         }
 
         div.rst-block ol {
             list-style: decimal;
             margin: 1em 0 1em 2em !important
         }
 
         div.rst-block pre, div.rst-block code {
             font: 12px "Bitstream Vera Sans Mono", "Courier", monospace
         }
 
         div.rst-block code {
             font-size: 12px !important;
             background-color: ghostWhite !important;
             color: #444 !important;
             padding: 0 .2em !important;
             border: 1px solid #7E7F7F !important
         }
 
         div.rst-block pre code {
             padding: 0 !important;
             font-size: 12px !important;
             background-color: #eee !important;
             border: none !important
         }
 
         div.rst-block pre {
             margin: 1em 0;
             padding: 15px;
             border: 1px solid #7E7F7F;
             -webkit-border-radius: 2px;
             -moz-border-radius: 2px;
             border-radius: 2px;
             overflow: auto;
             font-size: 12px;
             color: #444;
             background-color: #FFFFFF;
         }
 
         .clear-both {
             clear:both;
         }
 
         /*elasticmatch is custom rhodecode tag*/
         .codehilite .c-ElasticMatch {
             background-color: #faffa6;
             padding: 0.2em;
         }
 
         .codehilite .c-ElasticMatch { background-color: #faffa6; padding: 0.2em;}
         .codehilite .hll { background-color: #ffffcc }
         .codehilite .c { color: #408080; font-style: italic } /* Comment */
         .codehilite .err { border: none } /* Error */
         .codehilite .k { color: #008000; font-weight: bold } /* Keyword */
         .codehilite .o { color: #666666 } /* Operator */
         .codehilite .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
         .codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */
         .codehilite .cp { color: #BC7A00 } /* Comment.Preproc */
         .codehilite .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
         .codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */
         .codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */
         .codehilite .gd { color: #A00000 } /* Generic.Deleted */
         .codehilite .ge { font-style: italic } /* Generic.Emph */
         .codehilite .gr { color: #FF0000 } /* Generic.Error */
         .codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
         .codehilite .gi { color: #00A000 } /* Generic.Inserted */
         .codehilite .go { color: #888888 } /* Generic.Output */
         .codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
         .codehilite .gs { font-weight: bold } /* Generic.Strong */
         .codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
         .codehilite .gt { color: #0044DD } /* Generic.Traceback */
         .codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
         .codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
         .codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
         .codehilite .kp { color: #008000 } /* Keyword.Pseudo */
         .codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
         .codehilite .kt { color: #B00040 } /* Keyword.Type */
         .codehilite .m { color: #666666 } /* Literal.Number */
         .codehilite .s { color: #BA2121 } /* Literal.String */
         .codehilite .na { color: #7D9029 } /* Name.Attribute */
         .codehilite .nb { color: #008000 } /* Name.Builtin */
         .codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
         .codehilite .no { color: #880000 } /* Name.Constant */
         .codehilite .nd { color: #AA22FF } /* Name.Decorator */
         .codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */
         .codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
         .codehilite .nf { color: #0000FF } /* Name.Function */
         .codehilite .nl { color: #A0A000 } /* Name.Label */
         .codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
         .codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
         .codehilite .nv { color: #19177C } /* Name.Variable */
         .codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
         .codehilite .w { color: #bbbbbb } /* Text.Whitespace */
         .codehilite .mb { color: #666666 } /* Literal.Number.Bin */
         .codehilite .mf { color: #666666 } /* Literal.Number.Float */
         .codehilite .mh { color: #666666 } /* Literal.Number.Hex */
         .codehilite .mi { color: #666666 } /* Literal.Number.Integer */
         .codehilite .mo { color: #666666 } /* Literal.Number.Oct */
         .codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
         .codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
         .codehilite .sc { color: #BA2121 } /* Literal.String.Char */
         .codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
         .codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
         .codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
         .codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
         .codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
         .codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
         .codehilite .sx { color: #008000 } /* Literal.String.Other */
         .codehilite .sr { color: #BB6688 } /* Literal.String.Regex */
         .codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
         .codehilite .ss { color: #19177C } /* Literal.String.Symbol */
         .codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
         .codehilite .fm { color: #0000FF } /* Name.Function.Magic */
         .codehilite .vc { color: #19177C } /* Name.Variable.Class */
         .codehilite .vg { color: #19177C } /* Name.Variable.Global */
         .codehilite .vi { color: #19177C } /* Name.Variable.Instance */
         .codehilite .vm { color: #19177C } /* Name.Variable.Magic */
         .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
 
     </style>
 
 </head>
 <body>
 
 <div>
 <!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
 <table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:${text_regular|n};font-weight:100;border:1px solid #dbd9da">
     <tr>
         <td valign="top" style="padding:0;">
             <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
                 <tr>
                     <td style="width:100%;padding:10px 15px;background-color:#202020" valign="top">
                         <a style="color:#eeeeee;text-decoration:none;" href="${instance_url}">
                             ${_('RhodeCode')}
                             % if rhodecode_instance_name:
                                 - ${rhodecode_instance_name}
                             % endif
                         </a>
                     </td>
                 </tr>
                 <tr style="background-color: #fff">
                     <td style="padding:15px;" valign="top">${self.body()}</td>
                 </tr>
             </table>
         </td>
     </tr>
 </table>  
 <!-- End of wrapper table -->
 </div>
 
 <div style="width:100%; clear: both; height: 1px">&nbsp;</div>
 
 <div style="margin-left:1%;font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};">
     ${_('This is a notification from RhodeCode.')}
     <a style="font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};" href="${instance_url}">
         ${instance_url}
     </a>
 </div>
 </body>
 </html>