diff options
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/pulls/tab_menu.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/settings/webhook/history.tmpl | 10 | ||||
| -rw-r--r-- | templates/shared/combomarkdowneditor.tmpl | 4 | ||||
| -rw-r--r-- | templates/shared/misc/tabtitle.tmpl | 1 | ||||
| -rw-r--r-- | web_src/css/modules/container.css | 4 |
6 files changed, 13 insertions, 14 deletions
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 097d7b1f7c..58d3759a9d 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -6,7 +6,7 @@ <div class="issue-title-header"> {{$canEditIssueTitle := and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} <div class="issue-title" id="issue-title-display"> - <h1 class="gt-word-break"> + <h1 class="tw-break-anywhere"> {{RenderIssueTitle $.Context .Issue.Title ($.Repository.ComposeMetas ctx) | RenderCodeBlock}} <span class="index">#{{.Issue.Index}}</span> </h1> diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index d5a8d6ed21..8b192c44db 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -2,17 +2,17 @@ <div class="ui top attached pull tabular menu"> <a class="item {{if .PageIsPullConversation}}active{{end}}" href="{{.Issue.Link}}"> {{svg "octicon-comment-discussion"}} - {{ctx.Locale.Tr "repo.pulls.tab_conversation"}} + {{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.pulls.tab_conversation")}} <span class="ui small label">{{.Issue.NumComments}}</span> </a> <a class="item {{if .PageIsPullCommits}}active{{end}}" {{if .NumCommits}}href="{{.Issue.Link}}/commits"{{end}}> {{svg "octicon-git-commit"}} - {{ctx.Locale.Tr "repo.pulls.tab_commits"}} + {{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.pulls.tab_commits")}} <span class="ui small label">{{if .NumCommits}}{{.NumCommits}}{{else}}-{{end}}</span> </a> <a class="item {{if .PageIsPullFiles}}active{{end}}" href="{{.Issue.Link}}/files"> {{svg "octicon-diff"}} - {{ctx.Locale.Tr "repo.pulls.tab_files"}} + {{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.pulls.tab_files")}} <span class="ui small label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span> </a> {{if or .Diff.TotalAddition .Diff.TotalDeletion}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index 149840b0de..0e03b8ed1b 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -34,9 +34,11 @@ </div> <div class="info tw-hidden" id="info-{{.ID}}"> <div class="ui top attached tabular menu"> - <a class="item active" data-tab="request-{{.ID}}">{{ctx.Locale.Tr "repo.settings.webhook.request"}}</a> + <a class="item active" data-tab="request-{{.ID}}"> + {{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.settings.webhook.request")}} + </a> <a class="item" data-tab="response-{{.ID}}"> - {{ctx.Locale.Tr "repo.settings.webhook.response"}} + {{template "shared/misc/tabtitle" (ctx.Locale.Tr "repo.settings.webhook.response")}} {{if .ResponseInfo}} {{if .IsSucceed}} <span class="ui green label">{{.ResponseInfo.Status}}</span> @@ -49,10 +51,10 @@ </a> {{if or $.Permission.IsAdmin $.IsOrganizationOwner $.PageIsAdmin $.PageIsUserSettings}} <div class="right menu"> - <form class="item" action="{{$.Link}}/replay/{{.UUID}}" method="post"> + <form class="tw-py-2" action="{{$.Link}}/replay/{{.UUID}}" method="post"> {{$.CsrfTokenHtml}} <span data-tooltip-content="{{if $.Webhook.IsActive}}{{ctx.Locale.Tr "repo.settings.webhook.replay.description"}}{{else}}{{ctx.Locale.Tr "repo.settings.webhook.replay.description_disabled"}}{{end}}"> - <button class="ui tiny button{{if not $.Webhook.IsActive}} disabled{{end}}">{{svg "octicon-sync"}}</button> + <button class="ui tiny button tw-mr-0{{if not $.Webhook.IsActive}} disabled{{end}}">{{svg "octicon-sync"}}</button> </span> </form> </div> diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 5bb71e7cd4..a0145ab297 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -14,8 +14,8 @@ Template Attributes: <div {{if .ContainerId}}id="{{.ContainerId}}"{{end}} class="combo-markdown-editor {{.ContainerClasses}}" data-dropzone-parent-container="{{.DropzoneParentContainer}}"> {{if .MarkdownPreviewUrl}} <div class="ui top tabular menu"> - <a class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a> - <a class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a> + <a class="active item" data-tab-for="markdown-writer">{{template "shared/misc/tabtitle" (ctx.Locale.Tr "write")}}</a> + <a class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{template "shared/misc/tabtitle" (ctx.Locale.Tr "preview")}}</a> </div> {{end}} <div class="ui tab active" data-tab-panel="markdown-writer"> diff --git a/templates/shared/misc/tabtitle.tmpl b/templates/shared/misc/tabtitle.tmpl new file mode 100644 index 0000000000..dea9d4d757 --- /dev/null +++ b/templates/shared/misc/tabtitle.tmpl @@ -0,0 +1 @@ +<span class="resize-for-semibold" data-text="{{.}}">{{.}}</span> diff --git a/web_src/css/modules/container.css b/web_src/css/modules/container.css index c9df6ab3f5..4a442c35b1 100644 --- a/web_src/css/modules/container.css +++ b/web_src/css/modules/container.css @@ -12,10 +12,6 @@ width: 100%; } -.ui.container.fluid.padded { - padding: 0 var(--page-margin-x); -} - .ui[class*="center aligned"].container { text-align: center; } |