From ddc5ba632851f0918d3ecb815f61990be3a2645b Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 26 Jun 2023 09:57:59 +0800 Subject: [PATCH 1/4] adjust admin config width --- web_src/css/admin.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 792b76d3e2868..cc932b084cfb2 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -17,7 +17,7 @@ .admin dl.admin-dl-horizontal dd { margin-left: auto; - width: calc(100% - 245px); + width: calc(100% - 425px); } @media (max-width: 767.98px) { @@ -33,7 +33,7 @@ .admin dl.admin-dl-horizontal dt { font-weight: var(--font-weight-semibold); - width: 220px; + width: 400px; margin-right: 5px; overflow: hidden; text-overflow: ellipsis; From b627862076b997a5407c666c2004f94edc1bf797 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 26 Jun 2023 11:00:39 +0800 Subject: [PATCH 2/4] remove ellipsis --- web_src/css/admin.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index cc932b084cfb2..0a2a88f143e29 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -17,7 +17,7 @@ .admin dl.admin-dl-horizontal dd { margin-left: auto; - width: calc(100% - 425px); + width: calc(100% - 245px); } @media (max-width: 767.98px) { @@ -33,11 +33,8 @@ .admin dl.admin-dl-horizontal dt { font-weight: var(--font-weight-semibold); - width: 400px; + width: 220px; margin-right: 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } @media (max-width: 767.98px) { From 3d793c0ea0e405c864dd9a93aefcc9343a393edf Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 26 Jun 2023 11:57:01 +0800 Subject: [PATCH 3/4] fix --- templates/admin/config.tmpl | 24 ++++++++++++------------ templates/admin/dashboard.tmpl | 2 +- web_src/css/admin.css | 31 +++++++++++++------------------ 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 2ddc0c1ac6738..17fb2444d3f8d 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -4,7 +4,7 @@ {{.locale.Tr "admin.config.server_config"}}
-
+
{{.locale.Tr "admin.config.app_name"}}
{{AppName}}
{{.locale.Tr "admin.config.app_ver"}}
@@ -53,7 +53,7 @@ {{.locale.Tr "admin.config.ssh_config"}}
-
+
{{.locale.Tr "admin.config.ssh_enabled"}}
{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if not .SSH.Disabled}} @@ -88,7 +88,7 @@ {{.locale.Tr "admin.config.lfs_config"}}
-
+
{{.locale.Tr "admin.config.lfs_enabled"}}
{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .LFS.StartServer}} @@ -104,7 +104,7 @@ {{.locale.Tr "admin.config.db_config"}}
-
+
{{.locale.Tr "admin.config.db_type"}}
{{.DbCfg.Type}}
{{if not (eq .DbCfg.Type "sqlite3")}} @@ -132,7 +132,7 @@ {{.locale.Tr "admin.config.service_config"}}
-
+
{{.locale.Tr "admin.config.register_email_confirm"}}
{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{.locale.Tr "admin.config.disable_register"}}
@@ -186,7 +186,7 @@ {{.locale.Tr "admin.config.webhook_config"}}
-
+
{{.locale.Tr "admin.config.queue_length"}}
{{.Webhook.QueueLength}}
{{.locale.Tr "admin.config.deliver_timeout"}}
@@ -200,7 +200,7 @@ {{.locale.Tr "admin.config.mailer_config"}}
-
+
{{.locale.Tr "admin.config.mailer_enabled"}}
{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .MailerEnabled}} @@ -249,7 +249,7 @@ {{.locale.Tr "admin.config.cache_config"}}
-
+
{{.locale.Tr "admin.config.cache_adapter"}}
{{.CacheAdapter}}
{{if eq .CacheAdapter "memory"}} @@ -269,7 +269,7 @@ {{.locale.Tr "admin.config.session_config"}}
-
+
{{.locale.Tr "admin.config.session_provider"}}
{{.SessionConfig.Provider}}
{{.locale.Tr "admin.config.provider_config"}}
@@ -289,7 +289,7 @@ {{.locale.Tr "admin.config.picture_config"}}
-
+
{{.locale.Tr "admin.config.disable_gravatar"}}
@@ -310,7 +310,7 @@ {{.locale.Tr "admin.config.git_config"}}
-
+
{{.locale.Tr "admin.config.git_disable_diff_highlight"}}
{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{.locale.Tr "admin.config.git_max_diff_lines"}}
@@ -341,7 +341,7 @@ {{.locale.Tr "admin.config.log_config"}}
-
+
{{if .Loggers.xorm.IsEnabled}}
{{$.locale.Tr "admin.config.xorm_log_sql"}}
{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 20cf3ba7f485b..9d503a19b06ae 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -70,7 +70,7 @@ {{.locale.Tr "admin.dashboard.system_status"}}
-
+
{{.locale.Tr "admin.dashboard.server_uptime"}}
{{.SysStatus.StartTime}}
{{.locale.Tr "admin.dashboard.current_goroutine"}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 0a2a88f143e29..dfc398d286b31 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -15,32 +15,27 @@ flex-wrap: wrap; } -.admin dl.admin-dl-horizontal dd { - 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 */ +/* divider needs explicit width because the parent container is "display: flex" */ .admin dl.admin-dl-horizontal .ui.divider { width: 100%; } +.admin dl.admin-dl-horizontal dt, +.admin dl.admin-dl-horizontal dd { + line-height: 1em; + padding: 5px 0; +} + .admin dl.admin-dl-horizontal dt { + width: 300px; + max-width: calc(100% - 100px - 1em); font-weight: var(--font-weight-semibold); - width: 220px; - margin-right: 5px; } -@media (max-width: 767.98px) { - .admin dl.admin-dl-horizontal dt { - width: 160px; - } +.admin dl.admin-dl-horizontal dd { + margin-left: auto; + width: calc(100% - 300px - 1em); + min-width: 100px; } .admin code, From 21487ac4344b73f84e7763c06d705597c5eecad6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 26 Jun 2023 21:14:28 +0200 Subject: [PATCH 4/4] Use unitless line-height --- web_src/css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index dfc398d286b31..58e05273504d6 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -22,7 +22,7 @@ .admin dl.admin-dl-horizontal dt, .admin dl.admin-dl-horizontal dd { - line-height: 1em; + line-height: 1; padding: 5px 0; }