diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 9d3a3e8061..743574d0a5 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -21,7 +21,7 @@ {{.Name}} {{$timeSince := TimeSinceUnix .UpdatedUnix $.locale}} - {{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}} + {{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}} {{end}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 1aa21b906a..a1d1c04751 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -65,8 +65,8 @@

{{.FormatWarning}}

{{end}} -
-
+
+
{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}} {{.content | Safe}}
diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index 5eef220962..049121e24c 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -3,15 +3,6 @@ font-size: 16px; line-height: 1.5 !important; word-wrap: break-word; - background: var(--color-box-body); -} - -.markup.ui.segment { - padding: 3em; -} - -.markup.file-view { - padding: 2em !important; } .markup > *:first-child { @@ -309,6 +300,14 @@ .markup img { max-width: 100%; box-sizing: initial; +} + +/* this background ensures images can break
. We can only do this on + cases where the background is known and not transparent. */ +.markup.file-view img, +.comment-body .markup img, /* regular comment */ +.comment-content .markup img, /* code comment */ +.wiki .markup img { background: var(--color-box-body); } diff --git a/web_src/css/repository.css b/web_src/css/repository.css index de1c2eda58..08524feadb 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -965,10 +965,6 @@ max-width: 100%; } -.repository.view.issue .comment-list .ui.comments .avatar { - margin-right: 0.5rem; -} - .repository.view.issue .comment-list .comment > .content > div:first-child { border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -1093,6 +1089,14 @@ margin-left: 36px; } +.repository.view.issue .comment-list .comment > .avatar { + margin-top: 6px; +} + +.repository.view.issue .comment-list .comment > .avatar ~ .content { + margin-left: 3em; +} + .repository.view.issue .comment-list .code-comment img.avatar, .repository.view.issue .comment-list .comment img.avatar { width: 28px; @@ -2092,17 +2096,17 @@ height: 48px; } -.repository.wiki.view > .markup { - padding: 15px 30px; +.repository.wiki.new .ui.attached.tabular.menu.previewtabs { + margin-bottom: 15px; } -.repository.wiki.view > .markup h1:first-of-type, -.repository.wiki.view > .markup h2:first-of-type, -.repository.wiki.view > .markup h3:first-of-type, -.repository.wiki.view > .markup h4:first-of-type, -.repository.wiki.view > .markup h5:first-of-type, -.repository.wiki.view > .markup h6:first-of-type { - margin-top: 0; +.file-view.markup { + padding: 1em 2em; +} + +.wiki-content-main { + padding: 1em 2em !important; + margin-left: 1em !important; } @@ -2730,11 +2734,10 @@ width: 100% !important; max-width: 100% !important; margin: 0 !important; - padding: 0 !important; + padding: 1em; } .comment-body .markup { - padding: 1em; border-radius: 0 0 var(--border-radius) var(--border-radius); /* don't render outside box */ }