Skip to content

Commit f4190f8

Browse files
jonasfranzlafriks
authored andcommitted
Render plain text README.txt monospaced (#2721)
Signed-off-by: Jonas Franz <[email protected]>
1 parent 33647aa commit f4190f8

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

public/css/index.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/less/_repository.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@
270270
}
271271
}
272272

273+
.plain-text {
274+
padding: 1em 2em 1em 2em;
275+
}
276+
273277
.code-view {
274278
* {
275279
font-size: 12px;

routers/repo/view.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@ func renderDirectory(ctx *context.Context, treeLink string) {
9393
if isTextFile {
9494
d, _ := ioutil.ReadAll(dataRc)
9595
buf = append(buf, d...)
96-
ctx.Data["IsRenderedHTML"] = true
9796
if markup.Type(readmeFile.Name()) != "" {
97+
ctx.Data["IsMarkup"] = true
9898
ctx.Data["FileContent"] = string(markup.Render(readmeFile.Name(), buf, treeLink, ctx.Repo.Repository.ComposeMetas()))
9999
} else {
100+
ctx.Data["IsRenderedHTML"] = true
100101
ctx.Data["FileContent"] = string(bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1))
101102
}
102103
}
@@ -194,7 +195,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
194195
readmeExist := markup.IsReadmeFile(blob.Name())
195196
ctx.Data["ReadmeExist"] = readmeExist
196197
if markup.Type(blob.Name()) != "" {
197-
ctx.Data["IsRenderedHTML"] = true
198+
ctx.Data["IsMarkup"] = true
198199
ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
199200
} else if readmeExist {
200201
ctx.Data["IsRenderedHTML"] = true

templates/repo/view_file.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
{{end}}
3737
</h4>
3838
<div class="ui attached table segment">
39-
<div class="file-view {{if .IsRenderedHTML}}markdown{{else if .IsTextFile}}code-view{{end}} has-emoji">
40-
{{if .IsRenderedHTML}}
39+
<div class="file-view {{if .IsMarkup}}markdown{{else if .IsRenderedHTML}}plain-text{{else if .IsTextFile}}code-view{{end}} has-emoji">
40+
{{if .IsMarkup}}
4141
{{if .FileContent}}{{.FileContent | Str2html}}{{end}}
42+
{{else if .IsRenderedHTML}}
43+
<pre>{{if .FileContent}}{{.FileContent | Str2html}}{{end}}</pre>
4244
{{else if not .IsTextFile}}
4345
<div class="view-raw ui center">
4446
{{if .IsImageFile}}

0 commit comments

Comments
 (0)