From 10699872930005a79490dd47eb86438ff20f449d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 12 Jan 2024 23:04:19 +0800 Subject: [PATCH] Fix button size in "attached header right" (#28770) (#28774) Backport #28770 by wxiaoguang Co-authored-by: wxiaoguang (cherry picked from commit 2a0fbe23b8b00010aeadd793207033580bac1253) --- 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 84a15e7650..ad8c33b3f5 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -25,7 +25,7 @@ {{else if $.IsOrganizationOwner}}
{{$.CsrfTokenHtml}} - +
{{end}} diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index a718eed0f1..bb2e25e86c 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}}
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index c22f56a14f..fdc6b536c2 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 87912179a4..cd46aaf7e6 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2022,11 +2022,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); }