diff options
| author | silverwind <me@silverwind.io> | 2024-03-24 13:14:03 +0100 |
|---|---|---|
| committer | Gusted <postmaster@gusted.xyz> | 2024-03-28 16:43:14 +0100 |
| commit | a579a0f318b9d6b975e2b6feac1aa0a9054f4945 (patch) | |
| tree | e55e31aa9bd66d78759492d956da9b0bbecdbe12 /templates | |
| parent | [Port] gitea#29982 Introduce `.secondary-nav` and handle `.page-content` spac... (diff) | |
| download | forgejo-a579a0f318b9d6b975e2b6feac1aa0a9054f4945.tar.xz forgejo-a579a0f318b9d6b975e2b6feac1aa0a9054f4945.zip | |
[Port] gitea#30014: Various code view improvements
1. Restore missing styles for message close icon
2. Move `code-line-button` so that it does not go off-screen on small
viewports
3. Make `code-line-button` look and behave like other buttons
4. Make `code-line-button` work in blame
5. Make the active selection span the whole line, not just the code part
6. Tweak colors, make dark theme code bg darker, make line numbers same
color in diff and file view.
7. Move code background to parent, fixing border radius and other
problems
8. Enable code wrap in blame
9. Improve blame responsiveness
10. Remove `--color-code-sidebar-bg` in blame, now it uses same
background as code
11. Rename `--color-active-line` to `--color-highlight-bg`
12. Add `--color-highlight-bg`
13. Fix button group borders on hover and border-right on last button.
<img width="1343" alt="Screenshot 2024-03-23 at 22 34 13"
src="https://github.com/go-gitea/gitea/assets/115237/fcbb919f-5dc3-43f0-97f6-870d6f412554">
<img width="1334" alt="Screenshot 2024-03-23 at 22 34 26"
src="https://github.com/go-gitea/gitea/assets/115237/ca44c3b7-4328-4645-ba49-b0dc6a5ac06d">
<img width="1338" alt="Screenshot 2024-03-23 at 22 34 57"
src="https://github.com/go-gitea/gitea/assets/115237/00eb0b5a-1ec7-4669-a94a-4602b9d1c1ac">
<img width="1337" alt="Screenshot 2024-03-23 at 22 34 42"
src="https://github.com/go-gitea/gitea/assets/115237/752edc4a-064f-413c-9dff-c086187fcd85">
Fixes: https://github.com/go-gitea/gitea/issues/18074
---
Conflict resolution: Trivial.
Ref: https://codeberg.org/forgejo/forgejo/issues/2776
(cherry picked from commit db01bf6cc88a8a7b5132b9306b3af1649566b10f)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/devtest/gitea-ui.tmpl | 7 | ||||
| -rw-r--r-- | templates/repo/blame.tmpl | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 9ef0aa675a..26eaddae6a 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -2,6 +2,13 @@ <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}"> <div class="page-content devtest ui container"> <div> + <h1>Link</h1> + <div> + <a href="#">normal</a> + <a class="muted" href="#">muted</a> + <a class="suppressed" href="#">suppressed</a> + <a class="silenced" href="#">silenced</a> + </div> <h1>Button</h1> <div> Style: diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 67046b814c..9eb98f75fe 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -50,11 +50,11 @@ {{$row.Avatar}} </div> <div class="blame-message"> - <a href="{{$row.CommitURL}}" title="{{$row.CommitMessage}}"> + <a class="suppressed tw-text-text" href="{{$row.CommitURL}}" title="{{$row.CommitMessage}}"> {{$row.CommitMessage}} </a> </div> - <div class="blame-time"> + <div class="blame-time not-mobile"> {{$row.CommitSince}} </div> </div> @@ -62,7 +62,7 @@ </td> <td class="lines-blame-btn"> {{if $row.PreviousSha}} - <a href="{{$row.PreviousShaURL}}" data-tooltip-content='{{ctx.Locale.Tr "repo.blame_prior"}}'> + <a role="button" class="muted" href="{{$row.PreviousShaURL}}" data-tooltip-content='{{ctx.Locale.Tr "repo.blame_prior"}}'> {{svg "octicon-versions"}} </a> {{end}} @@ -84,6 +84,12 @@ {{end}} </tbody> </table> + <div class="code-line-menu tippy-target"> + {{if $.Permission.CanRead $.UnitTypeIssues}} + <a class="item ref-in-new-issue" role="menuitem" data-url-issue-new="{{.RepoLink}}/issues/new" data-url-param-body-link="{{.Repository.Link}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}{{if $.HasSourceRenderedToggle}}?display=source{{end}}" rel="nofollow noindex">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</a> + {{end}} + <a class="item copy-line-permalink" role="menuitem" data-url="{{.Repository.Link}}/src/commit/{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}{{if $.HasSourceRenderedToggle}}?display=source{{end}}">{{ctx.Locale.Tr "repo.file_copy_permalink"}}</a> + </div> {{end}} </div> </div> |