From 9543aeaf84cae7ce3700133ff048536471c543aa Mon Sep 17 00:00:00 2001 From: Norwin Date: Thu, 3 Oct 2019 16:54:33 +0000 Subject: [PATCH] readd .markdown class to all markup renderers (#8357) fixes #8299, a regression from 867f46f. unlike it's name suggests, the .markdown class is needed for most markup types. a future refactor should rename this class to something more generic --- public/css/index.css | 2 +- public/less/_repository.less | 1 + templates/repo/view_file.tmpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 1da2399c4..294539d39 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -505,7 +505,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository.file.list .non-diff-file-content .view-raw img{padding:5px 5px 0 5px} .repository.file.list .non-diff-file-content .plain-text{padding:1em 2em 1em 2em} .repository.file.list .non-diff-file-content .plain-text pre{word-break:break-word;white-space:pre-wrap} -.repository.file.list .non-diff-file-content .csv{overflow-x:auto} +.repository.file.list .non-diff-file-content .csv{overflow-x:auto;padding:0!important} .repository.file.list .non-diff-file-content pre{overflow:auto} .repository.file.list .sidebar{padding-left:0} .repository.file.list .sidebar .octicon{width:16px} diff --git a/public/less/_repository.less b/public/less/_repository.less index fde11f7a4..ade3477cc 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -429,6 +429,7 @@ .csv { overflow-x: auto; + padding: 0 !important; } pre { diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 895a72aae..50e4c3394 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -45,7 +45,7 @@
-
+
{{if .IsMarkup}} {{if .FileContent}}{{.FileContent | Safe}}{{end}} {{else if .IsRenderedHTML}}