From: Israel Madueme Date: Tue, 22 Jan 2019 16:58:00 +0000 (-0500) Subject: Bug 1518268 - Re-style all markdown content, consistently X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ccfd17921289ba938143cc4557181127ecac9c;p=thirdparty%2Fbugzilla.git Bug 1518268 - Re-style all markdown content, consistently --- diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index a9da45f31..495c0b6de 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -267,7 +267,7 @@ [% comment_tag = 'pre' %] [% END %] - <[% comment_tag FILTER none %] class="comment-text [%= "bz_private" IF comment.is_private %]" + <[% comment_tag FILTER none %] class="comment-text [%= "markdown-body" IF comment.is_markdown %] [%= "bz_private" IF comment.is_private %]" id="ct-[% comment.count FILTER none %]" data-comment-id="[% comment.id FILTER none %]" [% IF comment.is_markdown +%] data-ismarkdown="true" [% END ~%] diff --git a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl index 83502ed96..f801cfad1 100644 --- a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl @@ -50,7 +50,7 @@ [% ELSE %] [% comment_tag = 'pre' %] [% END %] - <[% comment_tag FILTER none %] id="comment-preview" class="comment-text"> + <[% comment_tag FILTER none %] id="comment-preview" class="comment-text markdown-body">
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index ef8834586..9e66c3bc9 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -664,87 +664,6 @@ h3.change-name { content: '\E145'; } -.comment-text { - white-space: pre-wrap; - line-height: 1.2; - font-size: 13px; - font-family: "Droid Sans Mono",Menlo,Monaco,"Courier New",monospace; - background: #fff; - color: #222; - margin: 1px 0 0 0; - overflow: auto; - padding: 8px; - border-top: 1px solid #ddd; -} - -body.platform-Win32 .comment-text, body.platform-Win64 .comment-text { - font-family: "Fira Mono", monospace; -} -.comment-text span.quote, .comment-text span.quote_wrapped, -div.comment-text pre { - background: #eee !important; - color: #444 !important; - display: block !important; - padding: 5px !important; - display: inline-block !important; - width: 99% !important; -} - -.comment-text.bz_private { - color: darkred; - border: 1px dashed darkred; -} - -/* Markdown comments */ -div.comment-text { - white-space: normal; - padding: 0 8px 0 8px; - font-family: inherit !important; - font-size: 14px !important; -} - -div.comment-text p, -div.comment-text li { - line-height: 21px; - max-width: 70em; -} - -div.comment-text code { - color: #444; - background-color: #eee; - font-size: 13px; - font-family: "Fira Mono","Droid Sans Mono",Menlo,Monaco,"Courier New",monospace; -} - -div.comment-text table { - border-collapse: collapse; -} - -div.comment-text th, div.comment-text td { - padding: 5px 10px; - border: 1px solid #ccc; -} - -div.comment-text hr { - display: block !important; -} - -div.comment-text blockquote { - background: #fcfcfc; - border-left: 5px solid #ccc; - margin: 1.5em 10px; - padding: 0.5em 10px; -} - - -div.comment-text blockquote > :first-child { - margin-top: 0; -} - -div.comment-text blockquote > :last-child { - margin-bottom: 0; -} - .comment-tags { padding: 0 8px !important; } @@ -849,7 +768,6 @@ div.comment-text blockquote > :last-child { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - padding: 4px 3px 5px; } #preview-throbber { diff --git a/extensions/BugModal/web/common_bug_modal.css b/extensions/BugModal/web/common_bug_modal.css index 473c4a445..b79f8a20f 100644 --- a/extensions/BugModal/web/common_bug_modal.css +++ b/extensions/BugModal/web/common_bug_modal.css @@ -609,10 +609,6 @@ h3.change-name { border-top: 1px solid #ddd; } -body.platform-Win32 .comment-text, body.platform-Win64 .comment-text { - font-family: "Fira Mono", monospace; -} - .comment-text span.quote, .comment-text span.quote_wrapped { background: #eee !important; color: #444 !important; diff --git a/extensions/EditComments/web/js/inline-editor.js b/extensions/EditComments/web/js/inline-editor.js index 217770e88..17618a605 100644 --- a/extensions/EditComments/web/js/inline-editor.js +++ b/extensions/EditComments/web/js/inline-editor.js @@ -102,7 +102,7 @@ Bugzilla.InlineCommentEditor = class InlineCommentEditor {
[% END %]