From 95d3d42c5fd51bcc64774841edad158f6e5ef60f Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Tue, 14 May 2019 18:02:59 +0200 Subject: [PATCH] Fix code overflow (#6914) --- public/css/index.css | 1 + public/less/_admin.less | 6 ++++++ templates/admin/config.tmpl | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/public/css/index.css b/public/css/index.css index 47e2519c5..fa449ec69 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -942,6 +942,7 @@ tbody.commit-list{vertical-align:baseline} .admin dl.admin-dl-horizontal dd{margin-left:275px} .admin dl.admin-dl-horizontal dt{font-weight:bolder;float:left;width:285px;clear:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .admin.config #test-mail-btn{margin-left:5px} +.admin code,.admin pre{white-space:pre-wrap;word-wrap:break-word} .explore{padding-top:15px} .explore .navbar{justify-content:center;padding-top:15px!important;margin-top:-15px!important;margin-bottom:15px!important;background-color:#fafafa!important;border-width:1px!important} .explore .navbar .octicon{width:16px;text-align:center;margin-right:5px} diff --git a/public/less/_admin.less b/public/less/_admin.less index af68a43db..0bd685142 100644 --- a/public/less/_admin.less +++ b/public/less/_admin.less @@ -65,4 +65,10 @@ margin-left: 5px; } } + + code, + pre { + white-space: pre-wrap; + word-wrap: break-word; + } } diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index b4fcb4d61..7a81eb266 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -254,7 +254,7 @@
{{.i18n.Tr "admin.config.session_provider"}}
{{.SessionConfig.Provider}}
{{.i18n.Tr "admin.config.provider_config"}}
-
{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}
+
{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig  | JsonPrettyPrint}}{{else}}-{{end}}
{{.i18n.Tr "admin.config.cookie_name"}}
{{.SessionConfig.CookieName}}
{{.i18n.Tr "admin.config.gc_interval_time"}}