Skip to content

Commit c98c7d9

Browse files
GiteaBotGiteaBot
authored
Merge branch 'main' into fix-tests
2 parents 805b32e + 94048f3 commit c98c7d9

File tree

13 files changed

+70
-66
lines changed

13 files changed

+70
-66
lines changed

‎templates/repo/branch/list.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
</div>
3030
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
3131
</td>
32-
<td class="right aligned middle aligned overflow-visible">
32+
{{/* FIXME: here and below, the tw-overflow-visible is not quite right but it is still needed the moment: to show the important buttons when the width is narrow */}}
33+
<td class="right aligned middle aligned tw-overflow-visible">
3334
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
3435
<button class="btn interact-bg show-create-branch-modal tw-p-2"
3536
data-modal="#create-branch-modal"
@@ -148,7 +149,8 @@
148149
{{end}}
149150
{{end}}
150151
</td>
151-
<td class="three wide right aligned overflow-visible">
152+
{{/* FIXME: here and above, the tw-overflow-visible is not quite right */}}
153+
<td class="three wide right aligned tw-overflow-visible">
152154
{{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}}
153155
<button class="btn interact-bg tw-p-2 show-modal show-create-branch-modal"
154156
data-branch-from="{{.DBBranch.Name}}"

‎templates/repo/commit_statuses.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{{if .Statuses}}
22
{{if and (eq (len .Statuses) 1) .Status.TargetURL}}
3-
<a class="tw-align-middle {{.AdditionalClasses}} tw-no-underline" data-tippy="commit-statuses" href="{{.Status.TargetURL}}">
3+
<a class="flex-text-inline tw-no-underline {{.AdditionalClasses}}" data-tippy="commit-statuses" href="{{.Status.TargetURL}}">
44
{{template "repo/commit_status" .Status}}
55
</a>
66
{{else}}
7-
<span class="tw-align-middle {{.AdditionalClasses}}" data-tippy="commit-statuses" tabindex="0">
7+
<span class="flex-text-inline {{.AdditionalClasses}}" data-tippy="commit-statuses" tabindex="0">
88
{{template "repo/commit_status" .Status}}
99
</span>
1010
{{end}}

‎templates/repo/diff/box.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235

236236
{{if and (not $.Repository.IsArchived) (not .DiffNotAvailable)}}
237237
<template id="issue-comment-editor-template">
238-
<div class="ui form comment">
238+
<form class="ui form comment">
239239
{{template "shared/combomarkdowneditor" (dict
240240
"CustomInit" true
241241
"MarkdownPreviewInRepo" $.Repository
@@ -252,7 +252,7 @@
252252
<button class="ui cancel button">{{ctx.Locale.Tr "repo.issues.cancel"}}</button>
253253
<button class="ui primary button">{{ctx.Locale.Tr "repo.issues.save"}}</button>
254254
</div>
255-
</div>
255+
</form>
256256
</template>
257257
{{end}}
258258
{{if (not .DiffNotAvailable)}}

‎templates/repo/latest_commit.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
…
44
{{else}}
55
{{if .LatestCommitUser}}
6-
{{ctx.AvatarUtils.Avatar .LatestCommitUser 24 "tw-mr-1"}}
6+
{{ctx.AvatarUtils.Avatar .LatestCommitUser 24}}
77
{{if and .LatestCommitUser.FullName DefaultShowFullName}}
88
<a class="muted author-wrapper" title="{{.LatestCommitUser.FullName}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
99
{{else}}
1010
<a class="muted author-wrapper" title="{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}" href="{{.LatestCommitUser.HomeLink}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
1111
{{end}}
1212
{{else}}
1313
{{if .LatestCommit.Author}}
14-
{{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24 "tw-mr-1"}}
14+
{{ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 24}}
1515
<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
1616
{{end}}
1717
{{end}}

‎templates/repo/settings/options.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
<span class="field">
734734
{{if .CodeIndexerStatus}}
735735
<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
736-
<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
736+
{{ShortSha .CodeIndexerStatus.CommitSha}}
737737
</a>
738738
{{else}}
739739
<span>{{ctx.Locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
@@ -752,7 +752,7 @@
752752
<span class="field">
753753
{{if and .StatsIndexerStatus .StatsIndexerStatus.CommitSha}}
754754
<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
755-
<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
755+
{{ShortSha .StatsIndexerStatus.CommitSha}}
756756
</a>
757757
{{else}}
758758
<span>{{ctx.Locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>

‎web_src/css/base.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,8 @@ strong.attention-caution, svg.attention-caution {
928928
color: var(--color-red-dark-1);
929929
}
930930

931-
.center:not(.popup) {
931+
/* FIXME: this is a longstanding dirty patch since 2015, it only makes the pages more messy and shouldn't be used */
932+
.center {
932933
text-align: center;
933934
}
934935

‎web_src/css/explore.css‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
.explore .secondary-nav {
2-
border-width: 1px !important;
3-
}
4-
5-
.explore .secondary-nav .svg {
6-
width: 16px;
7-
text-align: center;
8-
margin-right: 5px;
9-
}
10-
1+
/* FIXME: need to refactor the repo branches list page and move these styles to proper place */
112
.ui.repository.branches .info {
123
font-size: 12px;
134
color: var(--color-text-light);
@@ -20,12 +11,3 @@
2011
overflow: hidden;
2112
text-overflow: ellipsis;
2213
}
23-
24-
.ui.repository.branches .overflow-visible {
25-
overflow: visible;
26-
}
27-
28-
/* fix alignment of PR popup in branches table */
29-
.ui.repository.branches table .ui.popup {
30-
text-align: left;
31-
}

‎web_src/css/index.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,6 @@
8282
@import "./review.css";
8383
@import "./actions.css";
8484

85-
@tailwind utilities;
8685
@import "./helpers.css";
86+
87+
@tailwind utilities;

‎web_src/css/modules/navbar.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@
103103
#navbar .ui.dropdown .navbar-profile-admin {
104104
display: block;
105105
position: absolute;
106-
font-size: 10px;
106+
font-size: 9px;
107107
font-weight: var(--font-weight-bold);
108108
color: var(--color-nav-bg);
109109
background: var(--color-primary);
110-
padding: 2px 4px;
110+
padding: 2px 3px;
111111
border-radius: 10px;
112112
top: -1px;
113113
left: 18px;

‎web_src/css/repo.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ td .commit-summary {
123123
gap: 0.25em;
124124
}
125125

126+
@media (max-width: 767.98px) {
127+
.latest-commit .commit-id-short {
128+
display: none;
129+
}
130+
}
131+
126132
.repo-path {
127133
display: flex;
128134
overflow-wrap: anywhere;
@@ -1670,6 +1676,10 @@ tbody.commit-list {
16701676
white-space: nowrap;
16711677
}
16721678

1679+
.latest-commit .message-wrapper {
1680+
max-width: calc(100% - 2.5rem);
1681+
}
1682+
16731683
/* in the commit list, messages can wrap so we can use inline */
16741684
.commit-list .message-wrapper {
16751685
display: inline;

0 commit comments

Comments
 (0)