From 9c38271a3057c535c1ece114cc6c9dd501911056 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 08:53:22 +0900 Subject: [PATCH 1/7] refactor: move footer info to top It is useful when reporting errors. --- app/Views/errors/html/debug.css | 5 +---- app/Views/errors/html/error_exception.php | 19 ++++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 98f54dbc8a01..63c3c662cbaa 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -65,13 +65,10 @@ p.lead { display: inline; } -.footer { +.environment { background: var(--dark-bg-color); color: var(--light-text-color); -} -.footer .container { border-top: 1px solid #e7e7e7; - margin-top: 1rem; text-align: center; } diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index 406b48ec6772..047c2f4cd987 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -23,6 +23,12 @@
+
+ Displayed at — + PHP: — + CodeIgniter: -- + Environment: +

getCode() ? ' #' . $exception->getCode() : '') ?>

@@ -401,18 +407,5 @@

- - From 89f7ede4ec314a20b106fc7bcaab3ba59e621191 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:14:47 +0900 Subject: [PATCH 2/7] fix: remove invalid letter-spacing --- app/Views/errors/html/debug.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 63c3c662cbaa..c233c6a63a3c 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -19,7 +19,6 @@ body { } h1 { font-weight: lighter; - letter-spacing: 0.8; font-size: 3rem; color: var(--dark-text-color); margin: 0; From 93fe3adafced03f237d295af6515951d2b0185a1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:16:22 +0900 Subject: [PATCH 3/7] refactor: remove redundant rem --- app/Views/errors/html/debug.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index c233c6a63a3c..b133b054584f 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -108,7 +108,7 @@ p.lead { } .tabs a:link, .tabs a:visited { - padding: 0rem 1rem; + padding: 0 1rem; line-height: 2.7; text-decoration: none; color: var(--dark-text-color); From 2f009ca5e2db50554d2033e4d9e90dc37fa97679 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:18:16 +0900 Subject: [PATCH 4/7] refactor: tweaks css --- app/Views/errors/html/debug.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index b133b054584f..bbff6bf84e54 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -43,7 +43,7 @@ p.lead { color: var(--dark-text-color); } .header .container { - padding: 1rem 1.75rem 1.75rem 1.75rem; + padding: 1rem; } .header h1 { font-size: 2.5rem; @@ -148,9 +148,6 @@ p.lead { border-radius: 5px; color: #31708f; } -ul, ol { - line-height: 1.8; -} table { width: 100%; From 50409e80fcada8f8ef5157918f83ddc11ced80c9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 10:54:51 +0900 Subject: [PATCH 5/7] refactor: remove border-top --- app/Views/errors/html/debug.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index bbff6bf84e54..500013df49f1 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -67,7 +67,6 @@ p.lead { .environment { background: var(--dark-bg-color); color: var(--light-text-color); - border-top: 1px solid #e7e7e7; text-align: center; } From 199e3855b72ba60e78450b59ed0b209dde2cc0b3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 11:00:50 +0900 Subject: [PATCH 6/7] docs: add upgrade_447 --- user_guide_src/source/installation/upgrade_447.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_447.rst b/user_guide_src/source/installation/upgrade_447.rst index 07f85330b4ed..45eed909332e 100644 --- a/user_guide_src/source/installation/upgrade_447.rst +++ b/user_guide_src/source/installation/upgrade_447.rst @@ -16,6 +16,14 @@ Please refer to the upgrade instructions corresponding to your installation meth Mandatory File Changes ********************** +Error Files +=========== + +The error page has been updated. Please update the following files: + +- app/Views/errors/html/debug.css +- app/Views/errors/html/error_exception.php + **************** Breaking Changes **************** From d8945671f6b8cb44b210d16175dfde9a87c13eeb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 11:56:19 +0900 Subject: [PATCH 7/7] refactor: add padding to environment class --- app/Views/errors/html/debug.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 500013df49f1..6a050c8bb462 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -68,6 +68,7 @@ p.lead { background: var(--dark-bg-color); color: var(--light-text-color); text-align: center; + padding: 0.2rem; } .source {