From 4919bf6835cb950fc918743495ac7a1375f2e7db Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 18 Jul 2020 18:17:26 +0000 Subject: [PATCH 01/18] creates and implements generic markup less class --- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/view_file.tmpl | 2 +- web_src/less/{_markdown.less => _markup.less} | 6 +++--- web_src/less/index.less | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) rename web_src/less/{_markdown.less => _markup.less} (99%) diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index 09eeb3f27fe88..7036d9c10a6cc 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -12,7 +12,7 @@
-
+
{{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 889cb5a691d0d..d7fbdf2bb7275 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -64,7 +64,7 @@ {{end}}
-
+
{{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}} diff --git a/web_src/less/_markdown.less b/web_src/less/_markup.less similarity index 99% rename from web_src/less/_markdown.less rename to web_src/less/_markup.less index 09c94f0678af5..b189dbbdf8af2 100644 --- a/web_src/less/_markdown.less +++ b/web_src/less/_markup.less @@ -1,4 +1,4 @@ -.markdown:not(code) { +.markup:not(code) { overflow: hidden; font-size: 16px; line-height: 1.6 !important; @@ -513,7 +513,7 @@ } } -.markdown-block-error { +.markup-block-error { margin-bottom: 0 !important; border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; @@ -524,7 +524,7 @@ text-align: left !important; } -.markdown-block-error + pre { +.markup-block-error + pre { border-top: none !important; margin-top: 0 !important; border-top-left-radius: 0 !important; diff --git a/web_src/less/index.less b/web_src/less/index.less index f1ac49a5136b9..967968537ab7d 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -17,6 +17,7 @@ @import "_tribute"; @import "_font_i18n"; @import "_base"; +@import "_markup"; @import "_markdown"; @import "_home"; @import "_install"; From b5d5537e5d5bcda75bd1ffc186a6257d37bbbf20 Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 18 Jul 2020 23:05:37 +0000 Subject: [PATCH 02/18] How to give custom CSS to externally rendered html --- .../doc/advanced/external-renderers.en-us.md | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index 11e7f73ae9b7f..1f2661202fce2 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -98,3 +98,71 @@ Once your configuration changes have been made, restart Gitea to have changes ta **Note**: Prior to Gitea 1.12 there was a single `markup.sanitiser` section with keys that were redefined for multiple rules, however, there were significant problems with this method of configuration necessitating configuration through multiple sections. + +## Customising CSS +The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
` with classes `markup` and `XXXXX`. You can use these classes to specifically target the contents of your rendered HTML. + +And so you could write some Less: +```less +.markup.XXXXX { + + html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + } + + body { + color: #444; + font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; + font-size: 12px; + line-height: 1.7; + padding: 1em; + margin: auto; + max-width: 42em; + background: #fefefe; + } + + p { + color: orangered; + } +} +``` +which is equivalent to: +```css +.markup.XXXXX html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} + +.markup.XXXXX body { + color: #444; + font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; + font-size: 12px; + line-height: 1.7; + padding: 1em; + margin: auto; + max-width: 42em; + background: #fefefe; +} + +.markup.XXXXX p { + color: orangered; +} +``` +Add your stylesheet to your custom directory e.g `custom/public/css/my-style-XXXXX.less` or `custom/public/css/my-style-XXXXX.css` + +Then to import it, add it to the custom header or footer. `custom/templates/custom/header.tmpl` +```html + + +``` + +or if using pure CSS + +```html + +``` \ No newline at end of file From 273f6b0639a31ec0f368630b7743a00ec4b013a1 Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 18 Jul 2020 23:13:21 +0000 Subject: [PATCH 03/18] Clarifies sources of CSS styling of markup --- docs/content/doc/advanced/external-renderers.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index 1f2661202fce2..d531e8755a9b1 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -100,7 +100,7 @@ Once your configuration changes have been made, restart Gitea to have changes ta there were significant problems with this method of configuration necessitating configuration through multiple sections. ## Customising CSS -The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
` with classes `markup` and `XXXXX`. You can use these classes to specifically target the contents of your rendered HTML. +The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX`==`markdown`). Otherwise can use these classes to specifically target the contents of your rendered HTML. And so you could write some Less: ```less From 5794c70f7f14e6772d968447ea68f8190c07b68c Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 18 Jul 2020 23:14:47 +0000 Subject: [PATCH 04/18] further clarification of sources of markup styling --- docs/content/doc/advanced/external-renderers.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index d531e8755a9b1..3d87c75f929f3 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -100,7 +100,7 @@ Once your configuration changes have been made, restart Gitea to have changes ta there were significant problems with this method of configuration necessitating configuration through multiple sections. ## Customising CSS -The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX`==`markdown`). Otherwise can use these classes to specifically target the contents of your rendered HTML. +The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX` is `markdown`). Otherwise you can use these classes to specifically target the contents of your rendered HTML. And so you could write some Less: ```less From 67b494de587640430c71e861d2eb238f09303ceb Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Thu, 19 Nov 2020 15:18:04 +0000 Subject: [PATCH 05/18] rename _markdown to _markup --- web_src/less/_markup.less | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/web_src/less/_markup.less b/web_src/less/_markup.less index b189dbbdf8af2..54189979b871f 100644 --- a/web_src/less/_markup.less +++ b/web_src/less/_markup.less @@ -473,6 +473,34 @@ box-shadow: inset 0 -1px 0 var(--color-secondary); } +<<<<<<< HEAD +======= + .csv-data td, + .csv-data th { + padding: 5px; + overflow: hidden; + font-size: 12px; + line-height: 1; + text-align: left; + white-space: nowrap; + } + + .csv-data .blob-num { + padding: 10px 8px 9px; + text-align: right; + border: 0; + } + + .csv-data tr { + border-top: 0; + } + + .csv-data th { + font-weight: 600; + border-top: 0; + } + +>>>>>>> e38bfb88d... rename _markdown to _markup .ui.list .list, ol.ui.list ol, ul.ui.list ul { From e6f256ceb461e2ca9d19902eb29b391b3e52db53 Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Thu, 19 Nov 2020 15:43:28 +0000 Subject: [PATCH 06/18] remove defunct import --- web_src/less/index.less | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/less/index.less b/web_src/less/index.less index 967968537ab7d..8702c40fe6ee7 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -18,7 +18,6 @@ @import "_font_i18n"; @import "_base"; @import "_markup"; -@import "_markdown"; @import "_home"; @import "_install"; @import "_form"; From 82936c5e0422ef65c7051dff897ad1b54b3d6fc6 Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 17 Apr 2021 13:44:42 +0100 Subject: [PATCH 07/18] fix orphaned reference --- web_src/js/markdown/mermaid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/markdown/mermaid.js b/web_src/js/markdown/mermaid.js index a518bc73451c7..d0aefd1aff978 100644 --- a/web_src/js/markdown/mermaid.js +++ b/web_src/js/markdown/mermaid.js @@ -3,7 +3,7 @@ const MAX_SOURCE_CHARACTERS = 5000; function displayError(el, err) { el.closest('pre').classList.remove('is-loading'); const errorNode = document.createElement('div'); - errorNode.setAttribute('class', 'ui message error markdown-block-error mono'); + errorNode.setAttribute('class', 'ui message error markup-block-error mono'); errorNode.textContent = err.str || err.message || String(err); el.closest('pre').before(errorNode); } From 66d633739b28e9b0f17512402e2ef9349c684917 Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 17 Apr 2021 13:50:29 +0100 Subject: [PATCH 08/18] remove comments --- web_src/less/_markup.less | 3 --- 1 file changed, 3 deletions(-) diff --git a/web_src/less/_markup.less b/web_src/less/_markup.less index 54189979b871f..e5f3613957e9b 100644 --- a/web_src/less/_markup.less +++ b/web_src/less/_markup.less @@ -473,8 +473,6 @@ box-shadow: inset 0 -1px 0 var(--color-secondary); } -<<<<<<< HEAD -======= .csv-data td, .csv-data th { padding: 5px; @@ -500,7 +498,6 @@ border-top: 0; } ->>>>>>> e38bfb88d... rename _markdown to _markup .ui.list .list, ol.ui.list ol, ul.ui.list ul { From 29a2f09770090b62b391dcdcc85d2ff0c1522b3e Mon Sep 17 00:00:00 2001 From: HarvsG <11440490+HarvsG@users.noreply.github.com> Date: Sat, 17 Apr 2021 21:15:46 +0100 Subject: [PATCH 09/18] fix header navigation --- web_src/js/markdown/anchors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markdown/anchors.js index 62bf8c83c37d7..62561fe2504d8 100644 --- a/web_src/js/markdown/anchors.js +++ b/web_src/js/markdown/anchors.js @@ -16,7 +16,7 @@ function scrollToAnchor() { } export default function initMarkdownAnchors() { - if (!document.querySelector('.markdown')) return; + if (!document.querySelector('.markup')) return; for (const heading of document.querySelectorAll(headingSelector)) { const originalId = heading.id.replace(/^user-content-/, ''); From 416b54dc7ff52e7a9892a91c2115c596a8560cd9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 5 May 2021 17:41:40 +0200 Subject: [PATCH 10/18] patch by @silverwind --- templates/org/home.tmpl | 2 +- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/comment_form.tmpl | 4 ++-- templates/repo/diff/comments.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/empty.tmpl | 4 ++-- templates/repo/issue/comment_tab.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 4 ++-- templates/repo/issue/view_content/comments.tmpl | 8 ++++---- templates/repo/release/list.tmpl | 2 +- templates/repo/release/new.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/user/profile.tmpl | 2 +- web_src/js/index.js | 4 ++-- web_src/js/markdown/anchors.js | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 9b77ae6b3f2ab..5e0a53aa56843 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -11,7 +11,7 @@ {{if .IsOrganizationOwner}}{{svg "octicon-gear" 16 "mb-3"}}{{end}}
- {{if $.RenderedDescription}}

{{$.RenderedDescription|Str2html}}

{{end}} + {{if $.RenderedDescription}}

{{$.RenderedDescription|Str2html}}

{{end}}
{{if .Org.Location}}
{{svg "octicon-location"}} {{.Org.Location}}
{{end}} {{if .Org.Website}}
{{svg "octicon-link"}} {{.Org.Website}}
{{end}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 9a2f7bdd7fed0..582b66d5db6e5 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -164,7 +164,7 @@
-
+
{{$.i18n.Tr "loading"}}
diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index c82d32c214d8d..43e902bc89ff1 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -22,12 +22,12 @@
-
+
{{.i18n.Tr "loading"}}
- {{svg "octicon-markdown"}} {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}} + {{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}
{{if $.reply}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index b566ffce9a572..6e39fbe854991 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -51,7 +51,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} {{else}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 3efde70f50885..b7e1589aa14e0 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -44,7 +44,7 @@ {{.FileContent}}
-
+
{{.i18n.Tr "loading"}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 7dae7c0121660..21c600545639d 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -27,7 +27,7 @@

{{.i18n.Tr "repo.create_new_repo_command"}}

-
+ 
touch README.md
 git init
 {{if ne .Repository.DefaultBranch "master"}}git checkout -b {{.Repository.DefaultBranch}}{{end}}
@@ -41,7 +41,7 @@ git push -u origin {{.Repository.DefaultBranch}}

{{.i18n.Tr "repo.push_exist_repo"}}

-
+ 
git remote add origin {{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}
 git push -u origin {{.Repository.DefaultBranch}}
diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index ab874bdd13697..77e82930dcf90 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -8,7 +8,7 @@ {{- if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end -}}
-
+
{{.i18n.Tr "loading"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 8c2f36f04bc92..897d297d37cb5 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -5,7 +5,7 @@

{{.Milestone.Name}}

-
+
{{.Milestone.RenderedContent|Str2html}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index c7d3522abcf47..448d758e3ebfd 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -98,7 +98,7 @@
{{end}} {{if .Content}} -
+
{{.RenderedContent|Str2html}}
{{end}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 0482604b70292..e353d71ee969a 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -57,7 +57,7 @@
-
+
{{if .Issue.RenderedContent}} {{.Issue.RenderedContent|Str2html}} {{else}} @@ -191,7 +191,7 @@
-
+
{{$.i18n.Tr "loading"}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 81f0d0434a28c..4863f7f2f1e0b 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -64,7 +64,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} {{else}} @@ -442,7 +442,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} {{else}} @@ -552,7 +552,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} {{else}} @@ -739,7 +739,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} {{else}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 6829e3e8e2a13..b1e90fbccb082 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -132,7 +132,7 @@ {{end}} {{$.i18n.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.i18n.Tr "repo.release.ahead.target" .Target}}

-
+
{{Str2html .Note}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 8489d8959792e..c4b36597c68fa 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -53,7 +53,7 @@
-
+
{{$.i18n.Tr "loading"}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 0bc5858863325..fbb97db4ad329 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -61,7 +61,7 @@
{{end}}
-
+
{{.content | Str2html}}
{{if .sidebarPresent}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 18f3c9f6ddecd..29da9334932f4 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -36,7 +36,7 @@ {{end}} {{if $.RenderedDescription}}
  • -
    {{$.RenderedDescription|Str2html}}
    +
    {{$.RenderedDescription|Str2html}}
    • {{end}} {{range .OpenIDs}} diff --git a/web_src/js/index.js b/web_src/js/index.js index 89cc0aa11c13a..a2dff377fd019 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1475,7 +1475,7 @@ function initWikiForm() { text: plainText, wiki: true }, (data) => { - preview.innerHTML = `
    ${data}
    `; + preview.innerHTML = `
    ${data}
    `; renderMarkdownContent(); }); }; @@ -1555,7 +1555,7 @@ function initWikiForm() { const $form = $('.repository.wiki.new .ui.form'); const $root = $form.find('.field.content'); const loading = $root.data('loading'); - $root.append(`
    ${loading}
    `); + $root.append(`
    ${loading}
    `); initCommentPreviewTab($form); }, className: 'fa fa-file', diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markdown/anchors.js index 62561fe2504d8..b25fddc597573 100644 --- a/web_src/js/markdown/anchors.js +++ b/web_src/js/markdown/anchors.js @@ -1,6 +1,6 @@ import {svg} from '../svg.js'; -const headingSelector = '.markdown h1, .markdown h2, .markdown h3, .markdown h4, .markdown h5, .markdown h6'; +const headingSelector = '.markup h1, .markup h2, .markup h3, .markup h4, .markup h5, .markup h6'; function scrollToAnchor() { if (document.querySelector(':target')) return; From ead5a0b00b835a19b48d9c534cc586710e4b35ca Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 5 May 2021 18:13:19 +0200 Subject: [PATCH 11/18] Update docs/content/doc/advanced/external-renderers.en-us.md Co-authored-by: silverwind --- docs/content/doc/advanced/external-renderers.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index 5430bb0cb9897..8449b3743deed 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -99,7 +99,7 @@ Once your configuration changes have been made, restart Gitea to have changes ta **Note**: Prior to Gitea 1.12 there was a single `markup.sanitiser` section with keys that were redefined for multiple rules, however, there were significant problems with this method of configuration necessitating configuration through multiple sections. -## Customising CSS +## Customizing CSS The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
    ` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX` is `markdown`). Otherwise you can use these classes to specifically target the contents of your rendered HTML. And so you could write some Less: @@ -165,4 +165,4 @@ or if using pure CSS ```html -``` \ No newline at end of file +``` From a122a9896dab45389ae6eed16c628f594051c362 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 18:52:57 +0200 Subject: [PATCH 12/18] more renames markdown -> markup --- templates/repo/diff/comment_form.tmpl | 2 +- web_src/js/index.js | 16 ++++++++-------- web_src/js/{markdown => markup}/anchors.js | 0 web_src/js/{markdown => markup}/content.js | 0 web_src/js/{markdown => markup}/mermaid.js | 0 web_src/less/_base.less | 4 ++-- web_src/less/_repository.less | 12 ++++++------ web_src/less/_review.less | 4 ++-- web_src/less/features/animations.less | 2 +- web_src/less/index.less | 4 ++-- .../less/{_markup.less => markup/content.less} | 10 +++++----- web_src/less/{markdown => markup}/mermaid.less | 0 web_src/less/themes/theme-arc-green.less | 8 ++++---- 13 files changed, 31 insertions(+), 31 deletions(-) rename web_src/js/{markdown => markup}/anchors.js (100%) rename web_src/js/{markdown => markup}/content.js (100%) rename web_src/js/{markdown => markup}/mermaid.js (100%) rename web_src/less/{_markup.less => markup/content.less} (97%) rename web_src/less/{markdown => markup}/mermaid.less (100%) diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 43e902bc89ff1..628cd52dc25d4 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -27,7 +27,7 @@
    - {{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}} + {{svg "octicon-markup"}} {{$.root.i18n.Tr "repo.diff.comment.markup_info"}}
    {{if $.reply}} diff --git a/web_src/js/index.js b/web_src/js/index.js index a2dff377fd019..380939eba0738 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -11,8 +11,8 @@ import initClipboard from './features/clipboard.js'; import initHeatmap from './features/heatmap.js'; import initProject from './features/projects.js'; import initServiceWorker from './features/serviceworker.js'; -import initMarkdownAnchors from './markdown/anchors.js'; -import renderMarkdownContent from './markdown/content.js'; +import initMarkupAnchors from './markup/anchors.js'; +import renderMarkupContent from './markup/content.js'; import attachTribute from './features/tribute.js'; import createColorPicker from './features/colorpicker.js'; import createDropzone from './features/dropzone.js'; @@ -51,7 +51,7 @@ function initCommentPreviewTab($form) { }, (data) => { const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`); $previewPanel.html(data); - renderMarkdownContent(); + renderMarkupContent(); }); }); @@ -81,7 +81,7 @@ function initEditPreviewTab($form) { }, (data) => { const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`); $previewPanel.html(data); - renderMarkdownContent(); + renderMarkupContent(); }); }); } @@ -1107,7 +1107,7 @@ async function initRepository() { dz.emit('submit'); dz.emit('reload'); } - renderMarkdownContent(); + renderMarkupContent(); }); }); } else { @@ -1476,7 +1476,7 @@ function initWikiForm() { wiki: true }, (data) => { preview.innerHTML = `
    ${data}
    `; - renderMarkdownContent(); + renderMarkupContent(); }); }; @@ -2772,7 +2772,7 @@ $(document).ready(async () => { searchTeams(); searchRepositories(); - initMarkdownAnchors(); + initMarkupAnchors(); initCommentForm(); initInstall(); initArchiveLinks(); @@ -2830,7 +2830,7 @@ $(document).ready(async () => { initServiceWorker(), initNotificationCount(), initStopwatch(), - renderMarkdownContent(), + renderMarkupContent(), initGithook(), initImageDiff(), ]); diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markup/anchors.js similarity index 100% rename from web_src/js/markdown/anchors.js rename to web_src/js/markup/anchors.js diff --git a/web_src/js/markdown/content.js b/web_src/js/markup/content.js similarity index 100% rename from web_src/js/markdown/content.js rename to web_src/js/markup/content.js diff --git a/web_src/js/markdown/mermaid.js b/web_src/js/markup/mermaid.js similarity index 100% rename from web_src/js/markdown/mermaid.js rename to web_src/js/markup/mermaid.js diff --git a/web_src/less/_base.less b/web_src/less/_base.less index bba378dde2476..9b881aacac9a5 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -102,8 +102,8 @@ --color-active: #00000014; --color-menu: #ffffff; --color-card: #ffffff; - --color-markdown-table-row: #00000008; - --color-markdown-code-block: #00000010; + --color-markup-table-row: #00000008; + --color-markup-code-block: #00000010; --color-button: #ffffff; --color-code-bg: #ffffff; --color-shadow: #00000030; diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 5ff51b1d6df6b..549bd4d7e5324 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -580,7 +580,7 @@ border-right-color: var(--color-box-body); } - .markdown { + .markup { font-size: 14px; } } @@ -1020,7 +1020,7 @@ } } - .markdown { + .markup { font-size: 14px; } @@ -1040,7 +1040,7 @@ overflow: hidden; } - .tab.markdown { + .tab.markup { min-height: 5rem; } } @@ -1244,7 +1244,7 @@ margin-bottom: 1.5rem; } - .markdown { + .markup { font-size: 14px; } } @@ -1996,7 +1996,7 @@ margin-top: -5px; } - > .markdown { + > .markup { padding: 15px 30px; h1, @@ -2991,7 +2991,7 @@ td.blob-excerpt { .webhook-info { padding: 7px 12px; margin: 10px 0; - background-color: var(--color-markdown-code-block); + background-color: var(--color-markup-code-block); border: 1px solid var(--color-secondary); border-radius: 3px; font-size: 13px; diff --git a/web_src/less/_review.less b/web_src/less/_review.less index f6f5df20a21e2..2b8700a745487 100644 --- a/web_src/less/_review.less +++ b/web_src/less/_review.less @@ -81,7 +81,7 @@ .ui.active.tab { padding: .5em; - &.markdown { + &.markup { padding: 1em; min-height: 168px; } @@ -95,7 +95,7 @@ border-top: 1px solid var(--color-secondary); padding: 10px 0; - .markdown-info { + .markup-info { display: inline-block; margin: 5px 0; font-size: 12px; diff --git a/web_src/less/features/animations.less b/web_src/less/features/animations.less index 0b50440bf377e..f3491155cd9b2 100644 --- a/web_src/less/features/animations.less +++ b/web_src/less/features/animations.less @@ -28,7 +28,7 @@ border-radius: 100%; } -.markdown pre.is-loading, +.markup pre.is-loading, .editor-loading.is-loading { height: 12rem; } diff --git a/web_src/less/index.less b/web_src/less/index.less index a746200c03186..f52953f2a4874 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -9,7 +9,8 @@ @import "./features/imagediff.less"; @import "./features/codeeditor.less"; @import "./features/projects.less"; -@import "./markdown/mermaid.less"; +@import "./markup/content.less"; +@import "./markup/mermaid.less"; @import "./chroma/base.less"; @import "./chroma/light.less"; @@ -18,7 +19,6 @@ @import "_tribute"; @import "_font_i18n"; @import "_base"; -@import "_markup"; @import "_home"; @import "_install"; @import "_form"; diff --git a/web_src/less/_markup.less b/web_src/less/markup/content.less similarity index 97% rename from web_src/less/_markup.less rename to web_src/less/markup/content.less index ee8065da765ee..0196f7b43d683 100644 --- a/web_src/less/_markup.less +++ b/web_src/less/markup/content.less @@ -1,4 +1,4 @@ -.markup:not(code) { +.markup { overflow: hidden; font-size: 16px; line-height: 1.5 !important; @@ -290,7 +290,7 @@ } table tr:nth-child(2n) { - background-color: var(--color-markdown-table-row); + background-color: var(--color-markup-table-row); } img { @@ -404,7 +404,7 @@ padding: .2em .4em; margin: 0; font-size: 85%; - background-color: var(--color-markdown-code-block); + background-color: var(--color-markup-code-block); border-radius: 4px; } @@ -437,7 +437,7 @@ padding: 16px; font-size: 85%; line-height: 1.45; - background-color: var(--color-markdown-code-block); + background-color: var(--color-markup-code-block); border-radius: 4px; } @@ -477,7 +477,7 @@ line-height: 10px; color: var(--color-text-light); vertical-align: middle; - background-color: var(--color-markdown-code-block); + background-color: var(--color-markup-code-block); border: 1px solid var(--color-secondary); border-radius: 3px; box-shadow: inset 0 -1px 0 var(--color-secondary); diff --git a/web_src/less/markdown/mermaid.less b/web_src/less/markup/mermaid.less similarity index 100% rename from web_src/less/markdown/mermaid.less rename to web_src/less/markup/mermaid.less diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 7b4d676f8fa18..e6138957090df 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -97,8 +97,8 @@ --color-active: #ffffff16; --color-menu: #2e323e; --color-card: #2e323e; - --color-markdown-table-row: #ffffff06; - --color-markdown-code-block: #2a2e3a; + --color-markup-table-row: #ffffff06; + --color-markup-code-block: #2a2e3a; --color-button: #353846; --color-code-bg: #2a2e3a; --color-shadow: #00000060; @@ -300,7 +300,7 @@ a.ui.basic.green.label:hover { & + .editor-preview-side { background: #353945; - .markdown:not(code).ui.segment { + .markup.ui.segment { border-width: 0; } } @@ -753,7 +753,7 @@ img[src$="/img/matrix.svg"] { border-color: #4a4c58 #4a4c58 #d7d7da #d7d7da; } -.markdown-block-error { +.markup-block-error { border: 1px solid rgba(121, 71, 66, .5) !important; border-bottom: none !important; } From 551a47c304e2be8c1fef332b33f165009c4fb842 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 18:58:14 +0200 Subject: [PATCH 13/18] do not suggest less customization --- .../doc/advanced/external-renderers.en-us.md | 73 +++++-------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index 8449b3743deed..a37b18d1ee532 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -102,67 +102,32 @@ there were significant problems with this method of configuration necessitating ## Customizing CSS The external renderer is specified in the .ini in the format `[markup.XXXXX]` and the HTML supplied by your external renderer will be wrapped in a `
    ` with classes `markup` and `XXXXX`. The `markup` class provides out of the box styling (as does `markdown` if `XXXXX` is `markdown`). Otherwise you can use these classes to specifically target the contents of your rendered HTML. -And so you could write some Less: -```less -.markup.XXXXX { - - html { - font-size: 100%; - overflow-y: scroll; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - } - - body { - color: #444; - font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; - font-size: 12px; - line-height: 1.7; - padding: 1em; - margin: auto; - max-width: 42em; - background: #fefefe; - } - - p { - color: orangered; - } -} -``` -which is equivalent to: +And so you could write some CSS: ```css -.markup.XXXXX html { - font-size: 100%; - overflow-y: scroll; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; +.markup html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } -.markup.XXXXX body { - color: #444; - font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; - font-size: 12px; - line-height: 1.7; - padding: 1em; - margin: auto; - max-width: 42em; - background: #fefefe; +.markup body { + color: #444; + font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; + font-size: 12px; + line-height: 1.7; + padding: 1em; + margin: auto; + max-width: 42em; + background: #fefefe; } -.markup.XXXXX p { - color: orangered; +.markup p { + color: orangered; } ``` -Add your stylesheet to your custom directory e.g `custom/public/css/my-style-XXXXX.less` or `custom/public/css/my-style-XXXXX.css` - -Then to import it, add it to the custom header or footer. `custom/templates/custom/header.tmpl` -```html - - -``` - -or if using pure CSS +Add your stylesheet to your custom directory e.g `custom/public/css/my-style-XXXXX.css` and import it using a custom header file `custom/templates/custom/header.tmpl`: ```html - + ``` From 306f93618fe0f1b6b5847dd6c681eabe6a67c47a Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 19:00:13 +0200 Subject: [PATCH 14/18] add back tokens --- docs/content/doc/advanced/external-renderers.en-us.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/advanced/external-renderers.en-us.md index a37b18d1ee532..71fabc529d7b8 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/advanced/external-renderers.en-us.md @@ -104,14 +104,14 @@ The external renderer is specified in the .ini in the format `[markup.XXXXX]` an And so you could write some CSS: ```css -.markup html { +.markup.XXXXX html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } -.markup body { +.markup.XXXXX body { color: #444; font-family: Georgia, Palatino, 'Palatino Linotype', Times, 'Times New Roman', serif; font-size: 12px; @@ -122,7 +122,7 @@ And so you could write some CSS: background: #fefefe; } -.markup p { +.markup.XXXXX p { color: orangered; } ``` From ae0b526d74ec3c6b2ef148fe018623118ad88901 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 19:07:45 +0200 Subject: [PATCH 15/18] fix class whitespace, remove useless if-clause --- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/view_file.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index 7036d9c10a6cc..478c034e11074 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -12,7 +12,7 @@
    -
    +
    {{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 875a9f79a1eaf..5798ec875cbf1 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -64,7 +64,7 @@ {{end}}
    -
    +
    {{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}} From 944eb6ca0605cdb58bce7e658dbc67ccf0b8a7a1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 20:30:52 +0200 Subject: [PATCH 16/18] remove unused csv-data rules --- web_src/less/markup/content.less | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less index 0196f7b43d683..df87c21d8c546 100644 --- a/web_src/less/markup/content.less +++ b/web_src/less/markup/content.less @@ -483,31 +483,6 @@ box-shadow: inset 0 -1px 0 var(--color-secondary); } - .csv-data td, - .csv-data th { - padding: 5px; - overflow: hidden; - font-size: 12px; - line-height: 1; - text-align: left; - white-space: nowrap; - } - - .csv-data .blob-num { - padding: 10px 8px 9px; - text-align: right; - border: 0; - } - - .csv-data tr { - border-top: 0; - } - - .csv-data th { - font-weight: 600; - border-top: 0; - } - .ui.list .list, ol.ui.list ol, ul.ui.list ul { From 91d989434b688bdd0a8ac0253bc0f64a12891376 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 May 2021 08:34:59 +0200 Subject: [PATCH 17/18] use named exports and rename functions --- web_src/js/index.js | 8 ++++---- web_src/js/markup/anchors.js | 2 +- web_src/js/markup/content.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 283076a724b1b..9cb26569dd02e 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -11,19 +11,19 @@ import initClipboard from './features/clipboard.js'; import initHeatmap from './features/heatmap.js'; import initProject from './features/projects.js'; import initServiceWorker from './features/serviceworker.js'; -import initMarkupAnchors from './markup/anchors.js'; -import renderMarkupContent from './markup/content.js'; import attachTribute from './features/tribute.js'; import createColorPicker from './features/colorpicker.js'; import createDropzone from './features/dropzone.js'; import initTableSort from './features/tablesort.js'; import initImageDiff from './features/imagediff.js'; import ActivityTopAuthors from './components/ActivityTopAuthors.vue'; +import {createCodeEditor, createMonaco} from './features/codeeditor.js'; +import {initMarkupAnchors} from './markup/anchors.js'; import {initNotificationsTable, initNotificationCount} from './features/notification.js'; import {initStopwatch} from './features/stopwatch.js'; -import {createCodeEditor, createMonaco} from './features/codeeditor.js'; -import {svg, svgs} from './svg.js'; +import {renderMarkupContent} from './markup/content.js'; import {stripTags, mqBinarySearch} from './utils.js'; +import {svg, svgs} from './svg.js'; const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; diff --git a/web_src/js/markup/anchors.js b/web_src/js/markup/anchors.js index b25fddc597573..cc2ed5db78e48 100644 --- a/web_src/js/markup/anchors.js +++ b/web_src/js/markup/anchors.js @@ -15,7 +15,7 @@ function scrollToAnchor() { } } -export default function initMarkdownAnchors() { +export function initMarkupAnchors() { if (!document.querySelector('.markup')) return; for (const heading of document.querySelectorAll(headingSelector)) { diff --git a/web_src/js/markup/content.js b/web_src/js/markup/content.js index 918cd6fe8111f..f06c9908f2856 100644 --- a/web_src/js/markup/content.js +++ b/web_src/js/markup/content.js @@ -1,5 +1,5 @@ import {renderMermaid} from './mermaid.js'; -export default async function renderMarkdownContent() { +export async function renderMarkupContent() { await renderMermaid(document.querySelectorAll('code.language-mermaid')); } From 5fb559901b424c33526f89e57cb1f7502ddcb60a Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 May 2021 08:37:04 +0200 Subject: [PATCH 18/18] sort imports --- web_src/js/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 9cb26569dd02e..53843a6d22764 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -4,19 +4,19 @@ import Vue from 'vue'; import {htmlEscape} from 'escape-goat'; import 'jquery.are-you-sure'; -import initMigration from './features/migration.js'; +import ActivityTopAuthors from './components/ActivityTopAuthors.vue'; +import attachTribute from './features/tribute.js'; +import createColorPicker from './features/colorpicker.js'; +import createDropzone from './features/dropzone.js'; +import initClipboard from './features/clipboard.js'; import initContextPopups from './features/contextpopup.js'; import initGitGraph from './features/gitgraph.js'; -import initClipboard from './features/clipboard.js'; import initHeatmap from './features/heatmap.js'; +import initImageDiff from './features/imagediff.js'; +import initMigration from './features/migration.js'; import initProject from './features/projects.js'; import initServiceWorker from './features/serviceworker.js'; -import attachTribute from './features/tribute.js'; -import createColorPicker from './features/colorpicker.js'; -import createDropzone from './features/dropzone.js'; import initTableSort from './features/tablesort.js'; -import initImageDiff from './features/imagediff.js'; -import ActivityTopAuthors from './components/ActivityTopAuthors.vue'; import {createCodeEditor, createMonaco} from './features/codeeditor.js'; import {initMarkupAnchors} from './markup/anchors.js'; import {initNotificationsTable, initNotificationCount} from './features/notification.js';