diff options
| -rw-r--r-- | public/css/index.css | 5 | ||||
| -rw-r--r-- | public/less/_repository.less | 8 | ||||
| -rw-r--r-- | templates/repo/commits_table.tmpl | 18 |
3 files changed, 19 insertions, 12 deletions
diff --git a/public/css/index.css b/public/css/index.css index 28faf4835a..b19b85ad36 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -632,6 +632,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository #commits-table thead .sha{width:140px} .repository #commits-table thead .shatd{text-align:center} .repository #commits-table td.sha .sha.label{margin:0} +.repository #commits-table td.message{text-overflow:unset} .repository #commits-table.ui.basic.striped.table tbody tr:nth-child(2n){background-color:rgba(0,0,0,.02)!important} .repository #commits-table td.sha .sha.label,.repository #repo-files-table .sha.label{border:1px solid #bbb} .repository #commits-table td.sha .sha.label .detail.icon,.repository #repo-files-table .sha.label .detail.icon{background:#fafafa;margin:-6px -10px -4px 0;padding:5px 3px 5px 6px;border-left:1px solid #bbb;border-top-left-radius:0;border-bottom-left-radius:0} @@ -825,8 +826,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-list .message-wrapper{overflow:hidden;text-overflow:ellipsis;max-width:calc(100% - 50px);display:inline-block;vertical-align:middle} +.commit-list .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 9b0b7fdce7..eb183c1626 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1156,6 +1156,10 @@ margin: 0; } + td.message { + text-overflow: unset; + } + &.ui.basic.striped.table tbody tr:nth-child(2n) { background-color: rgba(0, 0, 0, 0.02) !important; } @@ -2172,12 +2176,12 @@ tbody.commit-list { .commit-list .message-wrapper { overflow: hidden; text-overflow: ellipsis; - max-width: calc(100% - 24px); + max-width: calc(100% - 50px); display: inline-block; vertical-align: middle; } -.commit-list .message-wrapper .commit-status-link { +.commit-list .commit-status-link { display: inline-block; vertical-align: middle; } diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index ebeb87b93c..7ea854103c 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -46,11 +46,11 @@ <tr> <td class="author"> {{if .User}} - {{if .User.FullName}} + {{if .User.FullName}} <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.User.FullName}}</a> - {{else}} + {{else}} <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/> <a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a> - {{end}} + {{end}} {{else}} <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/> {{.Author.Name}} {{end}} @@ -71,13 +71,15 @@ </td> <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 class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary}}</span> </span> + {{if IsMultilineCommitMessage .Message}} + <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> + {{end}} {{template "repo/commit_status" .Status}} + {{if IsMultilineCommitMessage .Message}} + <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre> + {{end}} </td> <td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td> </tr> |