Skip to content

Y
yii2
Commit 5f269399 by resurtm
Options

Better exception page look.

parent cc5426e5
Showing with 19 additions and 15 deletions
framework/yii/views/errorHandler/main.php
...@@ -205,7 +205,6 @@ html,body{ ...@@ -205,7 +205,6 @@ html,body{
background-color: #ffebeb; background-color: #ffebeb;
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 18px;
z-index: 100; z-index: 100;
margin-top: -61px; margin-top: -61px;
} }
...@@ -227,20 +226,25 @@ html,body{ ...@@ -227,20 +226,25 @@ html,body{
z-index: 200; z-index: 200;
display: block; display: block;
color: #aaa; color: #aaa;
line-height: 18px; line-height: 20px;
font-size: 14px; font-size: 12px;
margin-top: -61px; margin-top: -63px;
font-family: Consolas, Courier New, monospace; font-family: Consolas, Courier New, monospace;
} }
.call-stack ul li .code pre{ .call-stack ul li .code pre{
position: relative; position: relative;
z-index: 200; z-index: 200;
left: 50px; left: 50px;
line-height: 17px; line-height: 20px;
font-size: 14px; font-size: 12px;
font-family: Consolas, Courier New, monospace; font-family: Consolas, Courier New, monospace;
display: inline; display: inline;
} }
@-moz-document url-prefix() {
.call-stack ul li .code pre{
line-height: 20px;
}
}
/* request */ /* request */
.request{ .request{
...@@ -421,10 +425,10 @@ window.onload = function() { ...@@ -421,10 +425,10 @@ window.onload = function() {
lineFound = false, lineFound = false,
hoverLines = Sizzle('.hover-line'); hoverLines = Sizzle('.hover-line');
for (var i = 0, imax = codeBlocks.length; i < imax; ++i) { for (var i = 0, imax = codeBlocks.length - 1; i < imax; ++i) {
var lines = codeBlocks[i].getClientRects(); var lines = codeBlocks[i].getClientRects();
for (var j = 0, jmax = lines.length; j < jmax; ++j) { for (var j = 0, jmax = lines.length; j < jmax; ++j) {
if (clientY > lines[j].top && clientY < lines[j].bottom) { if (clientY >= lines[j].top && clientY <= lines[j].bottom) {
lineFound = true; lineFound = true;
break; break;
} }
...@@ -438,9 +442,9 @@ window.onload = function() { ...@@ -438,9 +442,9 @@ window.onload = function() {
hoverLines[k].className = 'hover-line'; hoverLines[k].className = 'hover-line';
} }
if (lineFound) { if (lineFound) {
var line = Sizzle('.call-stack-item:eq(' + i + ') .hover-line:eq(' + j + ')'); var line = Sizzle('.call-stack-item:eq(' + i + ') .hover-line:eq(' + j + ')')[0];
if (line[0]) { if (line) {
line[0].className = 'hover-line hover'; line.className = 'hover-line hover';
} }
} }
}; };
...@@ -459,11 +463,11 @@ window.onload = function() { ...@@ -459,11 +463,11 @@ window.onload = function() {
continue; continue;
} }
lineNumbers[i].style.top = parseInt(lines[i].top - top) + 'px'; lineNumbers[i].style.top = parseInt(lines[i].top - top) + 'px';
hoverLines[i].style.top = parseInt(lines[i].top - top) + 'px'; hoverLines[i].style.top = parseInt(lines[i].top - top - 3) + 'px';
hoverLines[i].style.height = parseInt(lines[i].bottom - lines[i].top + 1) + 'px'; hoverLines[i].style.height = parseInt(lines[i].bottom - lines[i].top + 6) + 'px';
if (parseInt(callStackItem.getAttribute('data-line')) == i) { if (parseInt(callStackItem.getAttribute('data-line')) == i) {
errorLine.style.top = parseInt(lines[i].top - top) + 'px'; errorLine.style.top = parseInt(lines[i].top - top - 3) + 'px';
errorLine.style.height = parseInt(lines[i].bottom - lines[i].top + 1) + 'px'; errorLine.style.height = parseInt(lines[i].bottom - lines[i].top + 6) + 'px';
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment