Skip to content

Commit 614d6df

Browse files
GiteaBotwxiaoguangHesterGsilverwind
authored
Fix admin-dl-horizontal (#25512) (#25535)
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 <[email protected]> Co-authored-by: HesterG <[email protected]> Co-authored-by: silverwind <[email protected]>
1 parent 345a25d commit 614d6df

File tree

3 files changed

+26
-31
lines changed

3 files changed

+26
-31
lines changed

‎templates/admin/config.tmpl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{.locale.Tr "admin.config.server_config"}}
55
</h4>
66
<div class="ui attached table segment">
7-
<dl class="dl-horizontal admin-dl-horizontal">
7+
<dl class="admin-dl-horizontal">
88
<dt>{{.locale.Tr "admin.config.app_name"}}</dt>
99
<dd>{{AppName}}</dd>
1010
<dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
@@ -53,7 +53,7 @@
5353
{{.locale.Tr "admin.config.ssh_config"}}
5454
</h4>
5555
<div class="ui attached table segment">
56-
<dl class="dl-horizontal admin-dl-horizontal">
56+
<dl class="admin-dl-horizontal">
5757
<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
5858
<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
5959
{{if not .SSH.Disabled}}
@@ -88,7 +88,7 @@
8888
{{.locale.Tr "admin.config.lfs_config"}}
8989
</h4>
9090
<div class="ui attached table segment">
91-
<dl class="dl-horizontal admin-dl-horizontal">
91+
<dl class="admin-dl-horizontal">
9292
<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
9393
<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
9494
{{if .LFS.StartServer}}
@@ -104,7 +104,7 @@
104104
{{.locale.Tr "admin.config.db_config"}}
105105
</h4>
106106
<div class="ui attached table segment">
107-
<dl class="dl-horizontal admin-dl-horizontal">
107+
<dl class="admin-dl-horizontal">
108108
<dt>{{.locale.Tr "admin.config.db_type"}}</dt>
109109
<dd>{{.DbCfg.Type}}</dd>
110110
{{if not (eq .DbCfg.Type "sqlite3")}}
@@ -132,7 +132,7 @@
132132
{{.locale.Tr "admin.config.service_config"}}
133133
</h4>
134134
<div class="ui attached table segment">
135-
<dl class="dl-horizontal admin-dl-horizontal">
135+
<dl class="admin-dl-horizontal">
136136
<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
137137
<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
138138
<dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
@@ -186,7 +186,7 @@
186186
{{.locale.Tr "admin.config.webhook_config"}}
187187
</h4>
188188
<div class="ui attached table segment">
189-
<dl class="dl-horizontal admin-dl-horizontal">
189+
<dl class="admin-dl-horizontal">
190190
<dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
191191
<dd>{{.Webhook.QueueLength}}</dd>
192192
<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
@@ -200,7 +200,7 @@
200200
{{.locale.Tr "admin.config.mailer_config"}}
201201
</h4>
202202
<div class="ui attached table segment">
203-
<dl class="dl-horizontal admin-dl-horizontal">
203+
<dl class="admin-dl-horizontal">
204204
<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
205205
<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
206206
{{if .MailerEnabled}}
@@ -249,7 +249,7 @@
249249
{{.locale.Tr "admin.config.cache_config"}}
250250
</h4>
251251
<div class="ui attached table segment">
252-
<dl class="dl-horizontal admin-dl-horizontal">
252+
<dl class="admin-dl-horizontal">
253253
<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
254254
<dd>{{.CacheAdapter}}</dd>
255255
{{if eq .CacheAdapter "memory"}}
@@ -269,7 +269,7 @@
269269
{{.locale.Tr "admin.config.session_config"}}
270270
</h4>
271271
<div class="ui attached table segment">
272-
<dl class="dl-horizontal admin-dl-horizontal">
272+
<dl class="admin-dl-horizontal">
273273
<dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
274274
<dd>{{.SessionConfig.Provider}}</dd>
275275
<dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
@@ -289,7 +289,7 @@
289289
{{.locale.Tr "admin.config.picture_config"}}
290290
</h4>
291291
<div class="ui attached table segment">
292-
<dl class="dl-horizontal admin-dl-horizontal">
292+
<dl class="admin-dl-horizontal">
293293
<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
294294
<dd>
295295
<div class="ui toggle checkbox">
@@ -310,7 +310,7 @@
310310
{{.locale.Tr "admin.config.git_config"}}
311311
</h4>
312312
<div class="ui attached table segment">
313-
<dl class="dl-horizontal admin-dl-horizontal">
313+
<dl class="admin-dl-horizontal">
314314
<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
315315
<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
316316
<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
@@ -341,7 +341,7 @@
341341
{{.locale.Tr "admin.config.log_config"}}
342342
</h4>
343343
<div class="ui attached table segment">
344-
<dl class="dl-horizontal admin-dl-horizontal">
344+
<dl class="admin-dl-horizontal">
345345
{{if .Loggers.xorm.IsEnabled}}
346346
<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
347347
<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>

‎templates/admin/dashboard.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
{{.locale.Tr "admin.dashboard.system_status"}}
7171
</h4>
7272
<div class="ui attached table segment">
73-
<dl class="dl-horizontal admin-dl-horizontal">
73+
<dl class="admin-dl-horizontal">
7474
<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
7575
<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
7676
<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>

‎web_src/css/admin.css

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,27 @@
1515
flex-wrap: wrap;
1616
}
1717

18-
.admin dl.admin-dl-horizontal dd {
19-
margin-left: auto;
20-
width: calc(100% - 245px);
21-
}
22-
23-
@media (max-width: 767.98px) {
24-
.admin dl.admin-dl-horizontal dd {
25-
width: calc(100% - 185px);
26-
}
27-
}
28-
29-
/* divider needs explicit width to become visible here */
18+
/* divider needs explicit width because the parent container is "display: flex" */
3019
.admin dl.admin-dl-horizontal .ui.divider {
3120
width: 100%;
3221
}
3322

23+
.admin dl.admin-dl-horizontal dt,
24+
.admin dl.admin-dl-horizontal dd {
25+
line-height: 1;
26+
padding: 5px 0;
27+
}
28+
3429
.admin dl.admin-dl-horizontal dt {
30+
width: 300px;
31+
max-width: calc(100% - 100px - 1em);
3532
font-weight: var(--font-weight-semibold);
36-
width: 220px;
37-
margin-right: 5px;
3833
}
3934

40-
@media (max-width: 767.98px) {
41-
.admin dl.admin-dl-horizontal dt {
42-
width: 160px;
43-
}
35+
.admin dl.admin-dl-horizontal dd {
36+
margin-left: auto;
37+
width: calc(100% - 300px - 1em);
38+
min-width: 100px;
4439
}
4540

4641
.admin code,

0 commit comments

Comments
 (0)