From ad0b637d46709085cae7ed54ef8c47dec5a1446a Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 12 Jan 2024 22:43:40 +0800 Subject: [PATCH] Fix button size in "attached header right" (#28770) Before:
![image](https://github.com/go-gitea/gitea/assets/2114189/c82f8615-04d4-408f-95bf-689c227a8814) ![image](https://github.com/go-gitea/gitea/assets/2114189/d01d05a7-09ca-48f3-a0e7-fec48119b426)
After: ![image](https://github.com/go-gitea/gitea/assets/2114189/e560398e-2fa4-4f46-9229-f6acc70e32ab) ![image](https://github.com/go-gitea/gitea/assets/2114189/bd18961d-0636-4584-b893-c465daaf40af) --- templates/org/team/teams.tmpl | 2 +- templates/repo/settings/lfs_file.tmpl | 6 +++--- templates/repo/settings/lfs_pointers.tmpl | 2 +- web_src/css/base.css | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 830fc8a33..f4ceada2a 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -26,7 +26,7 @@ {{else if $.IsOrganizationOwner}}
{{$.CsrfTokenHtml}} - +
{{end}} diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index a718eed0f..bb2e25e86 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -5,10 +5,10 @@ {{ctx.Locale.Tr "repo.settings.lfs"}} / {{.LFSFile.Oid}}
{{if .EscapeStatus.Escaped}} - {{ctx.Locale.Tr "repo.unescape_control_characters"}} - {{ctx.Locale.Tr "repo.escape_control_characters"}} + {{ctx.Locale.Tr "repo.unescape_control_characters"}} + {{ctx.Locale.Tr "repo.escape_control_characters"}} {{end}} - {{ctx.Locale.Tr "repo.settings.lfs_findcommits"}} + {{ctx.Locale.Tr "repo.settings.lfs_findcommits"}}
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index c22f56a14..fdc6b536c 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -11,7 +11,7 @@ {{end}} {{end}} - +
{{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 6f84f5e1d..cc1f6a839 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1764,11 +1764,12 @@ a.ui.basic.label:hover { bottom: 0; display: flex; align-items: center; + gap: 0.25em; } -.ui.attached.header > .ui.right > .button, -.ui.attached.header > .ui.right > .dropdown > .button { - padding: 8px 10px; +/* the default ".ui.attached.header > .ui.right" is only able to contain "tiny" buttons, other buttons are too large */ +.ui.attached.header > .ui.right .ui.tiny.button { + padding: 6px 10px; font-weight: var(--font-weight-normal); }