Skip to content

Commit 9450410

Browse files
silverwindlunnywxiaoguangtechknowlogick
authored
Improve ellipsis buttons (#17773)
* Improve ellipsis buttons - Remove icon font usage - Add aria-expanded attribute * rename function to match Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
1 parent e595986 commit 9450410

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

templates/repo/commits_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
{{end}}
6868
</span>
6969
{{if IsMultilineCommitMessage .Message}}
70-
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
70+
<button class="ui button ellipsis-button" aria-expanded="false">...</button>
7171
{{end}}
7272
{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
7373
{{if IsMultilineCommitMessage .Message}}

templates/repo/commits_list_small.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
{{ $commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String) }}
5050
<span class="mono commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
5151
{{if IsMultilineCommitMessage .Message}}
52-
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
52+
<button class="ui button ellipsis-button" aria-expanded="false">...</button>
5353
{{end}}
5454
{{if IsMultilineCommitMessage .Message}}
5555
<pre class="commit-body" style="display: none;">{{RenderCommitBody .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</pre>

templates/repo/view_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{{ $commitLink:= printf "%s/commit/%s" .RepoLink (PathEscape .LatestCommit.ID.String) }}
2929
<span class="grey commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
3030
{{if IsMultilineCommitMessage .LatestCommit.Message}}
31-
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
31+
<button class="ui button ellipsis-button" aria-expanded="false">...</button>
3232
<pre class="commit-body" style="display: none;">{{RenderCommitBody .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
3333
{{end}}
3434
</span>

web_src/js/features/repo-commit.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
const {csrfToken} = window.config;
22

3-
export function initRepoCommitButton() {
4-
$('.commit-button').on('click', function (e) {
3+
export function initRepoEllipsisButton() {
4+
$('.ellipsis-button').on('click', function (e) {
55
e.preventDefault();
6+
const expanded = $(this).attr('aria-expanded') === 'true';
67
$(this).parent().find('.commit-body').toggle();
8+
$(this).attr('aria-expanded', String(!expanded));
79
});
810
}
911

web_src/js/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
initRepoPullRequestMergeInstruction,
3737
initRepoPullRequestReview,
3838
} from './features/repo-issue.js';
39-
import {initRepoCommitButton, initRepoCommitLastCommitLoader} from './features/repo-commit.js';
39+
import {initRepoEllipsisButton, initRepoCommitLastCommitLoader} from './features/repo-commit.js';
4040
import {
4141
initFootLanguageMenu,
4242
initGlobalButtonClickOnEnter,
@@ -132,7 +132,7 @@ $(document).ready(() => {
132132
initRepoBranchButton();
133133
initRepoCodeView();
134134
initRepoCommentForm();
135-
initRepoCommitButton();
135+
initRepoEllipsisButton();
136136
initRepoCommitLastCommitLoader();
137137
initRepoDiffConversationForm();
138138
initRepoDiffFileViewToggle();

web_src/less/_base.less

+9
Original file line numberDiff line numberDiff line change
@@ -2104,6 +2104,15 @@ table th[data-sortt-desc] {
21042104
display: flex !important;
21052105
}
21062106

2107+
.ellipsis-button {
2108+
padding: 0 5px 8px !important;
2109+
display: inline-block !important;
2110+
user-select: none !important;
2111+
font-weight: 600 !important;
2112+
line-height: 6px !important;
2113+
vertical-align: middle !important;
2114+
}
2115+
21072116
.truncated-item-name {
21082117
line-height: 2em;
21092118
white-space: nowrap;

0 commit comments

Comments
 (0)