bluescreen: "caused by" facelift

nette · Oct 16, 2023 · a454dbd · a454dbd
1 parent 5a3a60b
commit a454dbd
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 26 deletions.
diff --git a/src/Tracy/BlueScreen/assets/bluescreen.css b/src/Tracy/BlueScreen/assets/bluescreen.css
@@ -193,7 +193,7 @@ html.tracy-bs-visible body {
 }
 
 #tracy-bs .tracy-section-panel {
-	background: #F4F3F1;
+	background: #5040200E;
 	padding: var(--tracy-space) var(--tracy-space) 0;
 	margin: 0 0 var(--tracy-space);
 	border-radius: 8px;
@@ -215,11 +215,12 @@ html.tracy-bs-visible body {
 #tracy-bs .tracy-section--error {
 	background: #CD1818;
 	color: white;
-	font-size: 13pt;
 	padding-top: var(--tracy-space);
 }
 
+#tracy-bs .tracy-section--error p,
 #tracy-bs .tracy-section--error h1 {
+	font-size: 13pt;
 	color: white;
 }
 
@@ -229,7 +230,7 @@ html.tracy-bs-visible body {
 	background: #FDF5CE !important;
 }
 
-#tracy-bs .tracy-section--error a {
+#tracy-bs .tracy-section--error h1 a {
 	color: #ffefa1 !important;
 }
 
@@ -259,6 +260,23 @@ html.tracy-bs-visible body {
 	font-style: normal;
 }
 
+#tracy-bs .tracy-section--error:has(.tracy-caused) {
+	border-radius: 0 0 0 8px;
+	overflow: hidden;
+}
+
+#tracy-bs .tracy-caused {
+	margin: 0 calc(-1.5 * var(--tracy-space));
+	padding: .3em calc(1.5 * var(--tracy-space));
+	background: #df8075;
+	white-space: nowrap;
+}
+
+#tracy-bs .tracy-caused a {
+	color: white;
+}
+
+
 
 /* source code */
 #tracy-bs pre.tracy-code > div {
@@ -322,18 +340,6 @@ html.tracy-bs-visible body {
 	color: #0003;
 }
 
-#tracy-bs .tracy-caused {
-	float: right;
-	padding: .3em calc(1.5 * var(--tracy-space));
-	background: #df8075;
-	border-radius: 0 0 0 8px;
-	white-space: nowrap;
-}
-
-#tracy-bs .tracy-caused a {
-	color: white;
-}
-
 #tracy-bs .tracy-callstack {
 	display: grid;
 	grid-template-columns: max-content 1fr;

diff --git a/src/Tracy/BlueScreen/assets/section-header.phtml b/src/Tracy/BlueScreen/assets/section-header.phtml
@@ -26,10 +26,10 @@ $code = $ex->getCode() ? ' #' . $ex->getCode() : '';
 	<a href="<?= Helpers::escapeHtml($item['link']) ?>" class="tracy-action"<?= empty($item['external']) ? '' : ' target="_blank" rel="noreferrer noopener"'?>><?= Helpers::escapeHtml($item['label']) ?>&#x25ba;</a>
 <?php endforeach ?>
 	</h1>
-</section>
 
-<?php if ($ex->getPrevious()): ?>
-<div class="tracy-caused">
-	<a href="#tracyCaused<?= count($exceptions) + 1 ?>">Caused by <?= Helpers::escapeHtml(get_debug_type($ex->getPrevious())) ?></a>
-</div>
-<?php endif ?>
+	<?php if ($ex->getPrevious()): ?>
+	<div class="tracy-caused">
+		<a href="#tracyCaused<?= count($exceptions) + 1 ?>">Caused by <?= Helpers::escapeHtml(get_debug_type($ex->getPrevious())) ?></a>
+	</div>
+	<?php endif ?>
+</section>
diff --git a/tests/Tracy/expected/Debugger.error-in-eval.expect b/tests/Tracy/expected/Debugger.error-in-eval.expect
@@ -23,8 +23,8 @@
 	<h1><span>The my error</span>
 	<a href="%a%" class="tracy-action" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
 	</h1>
-</section>
 
+	</section>
 
 
 

diff --git a/tests/Tracy/expected/Debugger.exception.fiber.html.expect b/tests/Tracy/expected/Debugger.exception.fiber.html.expect
@@ -23,8 +23,8 @@
 	<h1><span>The my exception</span>
 	<a href="%a%" class="tracy-action" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
 	</h1>
-</section>
 
+	</section>
 
 
 <section class="tracy-section tracy-section--stack">

diff --git a/tests/Tracy/expected/Debugger.exception.generator.html.expect b/tests/Tracy/expected/Debugger.exception.generator.html.expect
@@ -23,8 +23,8 @@
 	<h1><span>The my exception</span>
 	<a href="%a%" class="tracy-action" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
 	</h1>
-</section>
 
+	</section>
 
 
 <section class="tracy-section tracy-section--stack">

diff --git a/tests/Tracy/expected/Debugger.exception.html.expect b/tests/Tracy/expected/Debugger.exception.html.expect
@@ -23,8 +23,8 @@
 	<h1><span>The my exception</span>
 	<a href="%a%" class="tracy-action" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
 	</h1>
-</section>
 
+	</section>
 
 
 

diff --git a/tests/Tracy/expected/Debugger.strict.html.expect b/tests/Tracy/expected/Debugger.strict.html.expect
@@ -23,8 +23,8 @@
 	<h1><span>Only variables should be assigned by reference</span>
 	<a href="%a%" target="_blank" rel="noreferrer noopener">search&#x25ba;</a>
 	</h1>
-</section>
 
+	</section>