diff options
| author | silverwind <me@silverwind.io> | 2019-02-02 17:58:28 +0100 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-02-02 16:58:28 +0000 |
| commit | 12ee544411e2c3de410459494ab40536b45941bc (patch) | |
| tree | 2f76cf6c53feaa11be9583ea5c504aa93ba89e48 /templates | |
| parent | af22df8314a0ddfe180de04d70d4b3d70fdbf23d (diff) | |
| download | gitea-12ee544411e2c3de410459494ab40536b45941bc.tar.gz gitea-12ee544411e2c3de410459494ab40536b45941bc.zip | |
Fix wrapping long code lines in UI (#5927)
Wrapping was initially added in https://github.com/go-gitea/gitea/pull/2789
but it is currently disabled because the rule that applies wrapping to
the wrap class did not have enough CSS specificity.
Resolved the issue by using a general selector that matches all code
boxes. The previous wrap class was removed because it had only been
inconsistenly applied to various code boxes and because I found no easy
way to add classes to code boxes rendered in Markdown.
Also removed a seemingly useless :before on code view and added padding
to restore the spacing.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/box.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/diff/section_unified.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 331a17a5e9..5f04db409b 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -127,7 +127,7 @@ {{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 2))}} <a class="ui green button add-code-comment add-code-comment-left" data-path="{{$file.Name}}" data-side="left" data-idx="{{$line.LeftIdx}}">+</a> {{end}} - <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> + <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.LeftIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> </td> <td class="lines-num lines-num-new"> <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> @@ -137,7 +137,7 @@ {{if and $.SignedUserID $line.CanComment $.PageIsPullFiles (not (eq .GetType 3))}} <a class="ui green button add-code-comment add-code-comment-right" data-path="{{$file.Name}}" data-side="right" data-idx="{{$line.RightIdx}}">+</a> {{end}} - <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> + <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{if $line.RightIdx}}{{$section.GetComputedInlineDiffFor $line}}{{end}}</code></pre> </td> </tr> {{if gt (len $line.Comments) 0}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 53ccaedbc2..1c6f59fb09 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -19,7 +19,7 @@ {{if and $.root.SignedUserID $line.CanComment $.root.PageIsPullFiles}} <a class="ui green button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}" data-path="{{$file.Name}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">+</a> {{end}} - <pre><code class="wrap {{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> + <pre><code class="{{if $highlightClass}}language-{{$highlightClass}}{{else}}nohighlight{{end}}">{{$section.GetComputedInlineDiffFor $line}}</code></pre> </td> </tr> {{if gt (len $line.Comments) 0}} |