diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | public/css/index.css | 2 | ||||
| -rw-r--r-- | public/less/_repository.less | 13 | ||||
| -rw-r--r-- | templates/repo/commit_status.tmpl | 10 | ||||
| -rw-r--r-- | templates/repo/commits_table.tmpl | 18 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 9 |
6 files changed, 36 insertions, 18 deletions
@@ -395,7 +395,7 @@ css: npx postcss --use autoprefixer --no-map --replace public/css/* @diff=$$(git diff public/css/*); \ - if ([ ! -z "$CI" ] && [ -n "$$diff" ]); then \ + if ([ -n "$$CI" ] && [ -n "$$diff" ]); then \ echo "Generated files in public/css have changed, please commit the result:"; \ echo "$${diff}"; \ exit 1; \ diff --git a/public/css/index.css b/public/css/index.css index d192f43d15..8f575fcd95 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -803,6 +803,8 @@ footer .ui.left,footer .ui.right{line-height:40px} .stats-table .table-cell{display:table-cell} .stats-table .table-cell.tiny{height:.5em} tbody.commit-list{vertical-align:baseline} +.commit-list .message-wrapper{overflow:hidden;text-overflow:ellipsis;max-width:calc(100% - 24px);display:inline-block;vertical-align:middle} +.commit-list .message-wrapper .commit-status-link{display:inline-block;vertical-align:middle} .commit-body{white-space:pre-wrap} .git-notes.top{text-align:left} .git-notes .commit-body{margin:0} diff --git a/public/less/_repository.less b/public/less/_repository.less index 71062bfa0e..acf8d7b870 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -2219,6 +2219,19 @@ tbody.commit-list { vertical-align: baseline; } +.commit-list .message-wrapper { + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 24px); + display: inline-block; + vertical-align: middle; +} + +.commit-list .message-wrapper .commit-status-link { + display: inline-block; + vertical-align: middle; +} + .commit-body { white-space: pre-wrap; } diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl index f5bbbb02d6..638f81ed8f 100644 --- a/templates/repo/commit_status.tmpl +++ b/templates/repo/commit_status.tmpl @@ -1,15 +1,15 @@ {{if eq .State "pending"}} - <a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status circle icon yellow"></i></a> + <a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status circle icon yellow"></i></a> {{end}} {{if eq .State "success"}} - <a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status check icon green"></i></a> + <a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status check icon green"></i></a> {{end}} {{if eq .State "error"}} - <a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning icon red"></i></a> + <a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning icon red"></i></a> {{end}} {{if eq .State "failure"}} - <a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status remove icon red"></i></a> + <a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status remove icon red"></i></a> {{end}} {{if eq .State "warning"}} - <a href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning sign icon yellow"></i></a> + <a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning sign icon yellow"></i></a> {{end}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 10f4b60483..ebeb87b93c 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -47,9 +47,9 @@ <td class="author"> {{if .User}} {{if .User.FullName}} - <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.User.FullName}}</a> + <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.User.FullName}}</a> {{else}} - <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a> + <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a> {{end}} {{else}} <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/> {{.Author.Name}} @@ -69,12 +69,14 @@ {{end}} </a> </td> - <td class="message collapsing"> - <span class="has-emoji{{if gt .ParentCount 1}} grey text{{end}}">{{.Summary}}</span> - {{if IsMultilineCommitMessage .Message}} - <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> - <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre> - {{end}} + <td class="message"> + <span class="message-wrapper"> + <span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary}}</span> + {{if IsMultilineCommitMessage .Message}} + <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> + <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre> + {{end}} + </span> {{template "repo/commit_status" .Status}} </td> <td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index d88c42ccae..75269837cb 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -1,4 +1,4 @@ -<table id="repo-files-table" class="ui single line table"> +<table id="repo-files-table" class="ui single line table fixed"> <thead> <tr class="commit-list"> <th colspan="2"> @@ -27,12 +27,13 @@ </div> {{end}} </a> - <span class="grey has-emoji">{{.LatestCommit.Summary}} + {{template "repo/commit_status" .LatestCommitStatus}} + <span class="grey has-emoji commit-summary" title="{{.LatestCommit.Summary}}">{{.LatestCommit.Summary}} {{if IsMultilineCommitMessage .LatestCommit.Message}} <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> <pre class="commit-body" style="display: none;">{{RenderCommitBody .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> {{end}} - {{template "repo/commit_status" .LatestCommitStatus}}</span> + </span> </th> <th class="text grey right age">{{if .LatestCommit.Author}}{{TimeSince .LatestCommit.Author.When $.Lang}}{{end}}</th> </tr> @@ -82,7 +83,7 @@ {{end}} <td class="message has-emoji"> <span class="truncate"> - <a href="{{$.RepoLink}}/commit/{{$commit.ID}}">{{$commit.Summary}}</a> + <a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary}}</a> </span> </td> <td class="text grey right age">{{TimeSince $commit.Committer.When $.Lang}}</td> |