Skip to content

Commit c190334

Browse files
authored
Merge pull request #8626 from kenjis/refactor-error_exception.php
refactor: move footer info to top in error_exception.php
2 parents bbb9542 + d894567 commit c190334

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

app/Views/errors/html/debug.css

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ body {
1919
}
2020
h1 {
2121
font-weight: lighter;
22-
letter-spacing: 0.8;
2322
font-size: 3rem;
2423
color: var(--dark-text-color);
2524
margin: 0;
@@ -44,7 +43,7 @@ p.lead {
4443
color: var(--dark-text-color);
4544
}
4645
.header .container {
47-
padding: 1rem 1.75rem 1.75rem 1.75rem;
46+
padding: 1rem;
4847
}
4948
.header h1 {
5049
font-size: 2.5rem;
@@ -65,14 +64,11 @@ p.lead {
6564
display: inline;
6665
}
6766

68-
.footer {
67+
.environment {
6968
background: var(--dark-bg-color);
7069
color: var(--light-text-color);
71-
}
72-
.footer .container {
73-
border-top: 1px solid #e7e7e7;
74-
margin-top: 1rem;
7570
text-align: center;
71+
padding: 0.2rem;
7672
}
7773

7874
.source {
@@ -112,7 +108,7 @@ p.lead {
112108
}
113109
.tabs a:link,
114110
.tabs a:visited {
115-
padding: 0rem 1rem;
111+
padding: 0 1rem;
116112
line-height: 2.7;
117113
text-decoration: none;
118114
color: var(--dark-text-color);
@@ -152,9 +148,6 @@ p.lead {
152148
border-radius: 5px;
153149
color: #31708f;
154150
}
155-
ul, ol {
156-
line-height: 1.8;
157-
}
158151

159152
table {
160153
width: 100%;

app/Views/errors/html/error_exception.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323

2424
<!-- Header -->
2525
<div class="header">
26+
<div class="environment">
27+
Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
28+
PHP: <?= esc(PHP_VERSION) ?> &mdash;
29+
CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
30+
Environment: <?= ENVIRONMENT ?>
31+
</div>
2632
<div class="container">
2733
<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
2834
<p>
@@ -401,18 +407,5 @@
401407
</div> <!-- /container -->
402408
<?php endif; ?>
403409

404-
<div class="footer">
405-
<div class="container">
406-
407-
<p>
408-
Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
409-
PHP: <?= esc(PHP_VERSION) ?> &mdash;
410-
CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
411-
Environment: <?= ENVIRONMENT ?>
412-
</p>
413-
414-
</div>
415-
</div>
416-
417410
</body>
418411
</html>

user_guide_src/source/installation/upgrade_447.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ Please refer to the upgrade instructions corresponding to your installation meth
1616
Mandatory File Changes
1717
**********************
1818

19+
Error Files
20+
===========
21+
22+
The error page has been updated. Please update the following files:
23+
24+
- app/Views/errors/html/debug.css
25+
- app/Views/errors/html/error_exception.php
26+
1927
****************
2028
Breaking Changes
2129
****************

0 commit comments

Comments
 (0)