troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 06:39:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix admin-dl-horizontal (#25512) (#25535)

Browse source 
Backport #25512 by @wxiaoguang


![image](https://github.com/go-gitea/gitea/assets/2114189/fb731e07-da30-4470-8200-73b5ca8b78f1)


![image](https://github.com/go-gitea/gitea/assets/2114189/85930b6f-5df7-437f-863f-423f3b81dd26)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: HesterG <hestergong@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
Giteabot 2023-06-27 13:06:36 -04:00 committed by GitHub
parent 345a25d016
commit 614d6df2d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
templates/admin/config.tmpl
View file

@ -4,7 +4,7 @@
{{.locale.Tr "admin.config.server_config"}} {{.locale.Tr "admin.config.server_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.app_name"}}</dt> <dt>{{.locale.Tr "admin.config.app_name"}}</dt>
<dd>{{AppName}}</dd> <dd>{{AppName}}</dd>
<dt>{{.locale.Tr "admin.config.app_ver"}}</dt> <dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
@ -53,7 +53,7 @@
{{.locale.Tr "admin.config.ssh_config"}} {{.locale.Tr "admin.config.ssh_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt> <dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
{{if not .SSH.Disabled}} {{if not .SSH.Disabled}}
@ -88,7 +88,7 @@
{{.locale.Tr "admin.config.lfs_config"}} {{.locale.Tr "admin.config.lfs_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt> <dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
{{if .LFS.StartServer}} {{if .LFS.StartServer}}
@ -104,7 +104,7 @@
{{.locale.Tr "admin.config.db_config"}} {{.locale.Tr "admin.config.db_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.db_type"}}</dt> <dt>{{.locale.Tr "admin.config.db_type"}}</dt>
<dd>{{.DbCfg.Type}}</dd> <dd>{{.DbCfg.Type}}</dd>
{{if not (eq .DbCfg.Type "sqlite3")}} {{if not (eq .DbCfg.Type "sqlite3")}}
@ -132,7 +132,7 @@
{{.locale.Tr "admin.config.service_config"}} {{.locale.Tr "admin.config.service_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt> <dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
<dt>{{.locale.Tr "admin.config.disable_register"}}</dt> <dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
@ -186,7 +186,7 @@
{{.locale.Tr "admin.config.webhook_config"}} {{.locale.Tr "admin.config.webhook_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.queue_length"}}</dt> <dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
<dd>{{.Webhook.QueueLength}}</dd> <dd>{{.Webhook.QueueLength}}</dd>
<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt> <dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
@ -200,7 +200,7 @@
{{.locale.Tr "admin.config.mailer_config"}} {{.locale.Tr "admin.config.mailer_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt> <dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
{{if .MailerEnabled}} {{if .MailerEnabled}}
@ -249,7 +249,7 @@
{{.locale.Tr "admin.config.cache_config"}} {{.locale.Tr "admin.config.cache_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt> <dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
<dd>{{.CacheAdapter}}</dd> <dd>{{.CacheAdapter}}</dd>
{{if eq .CacheAdapter "memory"}} {{if eq .CacheAdapter "memory"}}
@ -269,7 +269,7 @@
{{.locale.Tr "admin.config.session_config"}} {{.locale.Tr "admin.config.session_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.session_provider"}}</dt> <dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
<dd>{{.SessionConfig.Provider}}</dd> <dd>{{.SessionConfig.Provider}}</dd>
<dt>{{.locale.Tr "admin.config.provider_config"}}</dt> <dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
@ -289,7 +289,7 @@
{{.locale.Tr "admin.config.picture_config"}} {{.locale.Tr "admin.config.picture_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt> <dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
<dd> <dd>
<div class="ui toggle checkbox"> <div class="ui toggle checkbox">
@ -310,7 +310,7 @@
{{.locale.Tr "admin.config.git_config"}} {{.locale.Tr "admin.config.git_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt> <dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt> <dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
@ -341,7 +341,7 @@
{{.locale.Tr "admin.config.log_config"}} {{.locale.Tr "admin.config.log_config"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
{{if .Loggers.xorm.IsEnabled}} {{if .Loggers.xorm.IsEnabled}}
<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt> <dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd> <dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>

2
templates/admin/dashboard.tmpl
View file

@ -70,7 +70,7 @@
{{.locale.Tr "admin.dashboard.system_status"}} {{.locale.Tr "admin.dashboard.system_status"}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
<dl class="dl-horizontal admin-dl-horizontal"> <dl class="admin-dl-horizontal">
<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt> <dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd> <dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt> <dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>

31
web_src/css/admin.css
View file

@ -15,32 +15,27 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
.admin dl.admin-dl-horizontal dd { /* divider needs explicit width because the parent container is "display: flex" */
margin-left: auto;
width: calc(100% - 245px);
}
@media (max-width: 767.98px) {
.admin dl.admin-dl-horizontal dd {
width: calc(100% - 185px);
}
}
/* divider needs explicit width to become visible here */
.admin dl.admin-dl-horizontal .ui.divider { .admin dl.admin-dl-horizontal .ui.divider {
width: 100%; width: 100%;
} }
.admin dl.admin-dl-horizontal dt { .admin dl.admin-dl-horizontal dt,
font-weight: var(--font-weight-semibold); .admin dl.admin-dl-horizontal dd {
width: 220px; line-height: 1;
margin-right: 5px; padding: 5px 0;
} }
@media (max-width: 767.98px) {
.admin dl.admin-dl-horizontal dt { .admin dl.admin-dl-horizontal dt {
width: 160px; width: 300px;
max-width: calc(100% - 100px - 1em);
font-weight: var(--font-weight-semibold);
} }
.admin dl.admin-dl-horizontal dd {
margin-left: auto;
width: calc(100% - 300px - 1em);
min-width: 100px;
} }
.admin code, .admin code,