From c290a548f3429e46730b7ee4c2a86e65077009cc Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sat, 27 Jul 2024 15:10:54 +0200 Subject: [PATCH] added CSS class .tracy-dump-seamless --- src/Tracy/Bar/assets/bar.css | 2 +- src/Tracy/BlueScreen/assets/bluescreen.css | 12 ++---------- src/Tracy/BlueScreen/assets/section-cli.phtml | 2 +- .../BlueScreen/assets/section-environment.phtml | 8 ++++---- src/Tracy/BlueScreen/assets/section-http.phtml | 10 +++++----- .../BlueScreen/assets/section-stack-callStack.phtml | 2 +- src/Tracy/Dumper/assets/dumper-dark.css | 7 +++++++ src/Tracy/Dumper/assets/dumper-light.css | 7 +++++++ src/Tracy/assets/reset.css | 9 +-------- tests/Tracy/expected/Debugger.error-in-eval.expect | 10 +++++----- .../expected/Debugger.exception.fiber.html.expect | 10 +++++----- .../Debugger.exception.generator.html.expect | 6 +++--- tests/Tracy/expected/Debugger.exception.html.expect | 12 ++++++------ tests/Tracy/expected/Debugger.strict.html.expect | 12 ++++++------ 14 files changed, 54 insertions(+), 55 deletions(-) diff --git a/src/Tracy/Bar/assets/bar.css b/src/Tracy/Bar/assets/bar.css index 4687dfb56..f6a466fcc 100644 --- a/src/Tracy/Bar/assets/bar.css +++ b/src/Tracy/Bar/assets/bar.css @@ -84,7 +84,7 @@ body#tracy-debug { /* in popup window */ display: inline; } -#tracy-debug .tracy-dump { +#tracy-debug .tracy-dump:where(:not(.tracy-dump-seamless .tracy-dump)) { margin: 0; padding: 2px 5px; } diff --git a/src/Tracy/BlueScreen/assets/bluescreen.css b/src/Tracy/BlueScreen/assets/bluescreen.css index bbe86c943..0a9d8bbdc 100644 --- a/src/Tracy/BlueScreen/assets/bluescreen.css +++ b/src/Tracy/BlueScreen/assets/bluescreen.css @@ -97,7 +97,7 @@ html.tracy-bs-visible body { font: 9pt/1.5 Consolas, monospace !important; } -#tracy-bs pre, +#tracy-bs pre:not(.tracy-dump-seamless pre), #tracy-bs table { background: #FDF5CE; padding: .4em .7em; @@ -106,13 +106,6 @@ html.tracy-bs-visible body { overflow: auto; } -#tracy-bs table pre { - padding: 0; - margin: 0; - border: none; - box-shadow: none; -} - #tracy-bs table { border-collapse: collapse; width: 100%; @@ -134,8 +127,7 @@ html.tracy-bs-visible body { width: 20%; } -#tracy-bs tr:nth-child(2n), -#tracy-bs tr:nth-child(2n) pre { +#tracy-bs tr:nth-child(2n) { background-color: #F7F0CB; } diff --git a/src/Tracy/BlueScreen/assets/section-cli.phtml b/src/Tracy/BlueScreen/assets/section-cli.phtml index 6d06e40d6..3230861ab 100644 --- a/src/Tracy/BlueScreen/assets/section-cli.phtml +++ b/src/Tracy/BlueScreen/assets/section-cli.phtml @@ -25,7 +25,7 @@ if (!Helpers::isCli()) {

Arguments

- +
$v): ?> diff --git a/src/Tracy/BlueScreen/assets/section-environment.phtml b/src/Tracy/BlueScreen/assets/section-environment.phtml index 866ec8976..1e17b75e1 100644 --- a/src/Tracy/BlueScreen/assets/section-environment.phtml +++ b/src/Tracy/BlueScreen/assets/section-environment.phtml @@ -41,7 +41,7 @@ $constants = get_defined_constants(true)['user'] ?? [];
-
+
$v): ?> @@ -52,7 +52,7 @@ $constants = get_defined_constants(true)['user'] ?? [];
-
+
$v): ?> @@ -63,7 +63,7 @@ $constants = get_defined_constants(true)['user'] ?? [];

Nette Session

-
Nette Session' : $dump($v, $k) ?>
+
$v): ?> @@ -77,7 +77,7 @@ $constants = get_defined_constants(true)['user'] ?? [];
-
+
$v): ?> diff --git a/src/Tracy/BlueScreen/assets/section-http.phtml b/src/Tracy/BlueScreen/assets/section-http.phtml index 000ef1a8b..73043d5ba 100644 --- a/src/Tracy/BlueScreen/assets/section-http.phtml +++ b/src/Tracy/BlueScreen/assets/section-http.phtml @@ -35,7 +35,7 @@ if (Helpers::isCli()) {
-
+
$v): ?> @@ -49,7 +49,7 @@ if (Helpers::isCli()) {

empty

-
+
$v): ?> @@ -70,7 +70,7 @@ if (Helpers::isCli()) {

$_POST

-
+
$v): ?> @@ -84,7 +84,7 @@ if (Helpers::isCli()) {

empty

-
+
$v): ?> @@ -98,7 +98,7 @@ if (Helpers::isCli()) {

Code:

-
+
diff --git a/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml b/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml index 74b3744d8..571fa98f7 100644 --- a/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml +++ b/src/Tracy/BlueScreen/assets/section-stack-callStack.phtml @@ -67,7 +67,7 @@ if (!$stack) { -
+
-
+
@@ -87,7 +87,7 @@ 
 
-
$message
'The my error'
+
$user
'root'
$pass

@@ -125,7 +125,7 @@
 
 		

 			

-				
+				

 				%A%
 				

 			

@@ -135,7 +135,7 @@
 
 
 			

-				
+				

 				%A%
 				

 			

@@ -186,7 +186,7 @@
 			

 			
Code: %d%

 			

-				%A%

+				%A%

 			

 
 
diff --git a/tests/Tracy/expected/Debugger.exception.fiber.html.expect b/tests/Tracy/expected/Debugger.exception.fiber.html.expect
index b3878636b..7f87b6568 100644
--- a/tests/Tracy/expected/Debugger.exception.fiber.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.fiber.html.expect
@@ -66,7 +66,7 @@
 		

 			
 
-			
+			

 
$arg1

 

 			

@@ -83,7 +83,7 @@
 		

 			
 
-			
+			

 
$arg1
true

 

 
$arg2
false

@@ -102,7 +102,7 @@
 		

 			
 
-			
+			

 
$arg1

 

 
$arg2
'any string'

@@ -134,7 +134,7 @@
 		

 			
%A%

 
-			
+			

 
$value
123

 

 			

@@ -151,7 +151,7 @@
 		

 			
%A%

 
-			
+			

 
$a
123

 

 			

diff --git a/tests/Tracy/expected/Debugger.exception.generator.html.expect b/tests/Tracy/expected/Debugger.exception.generator.html.expect
index 453ef246a..266484965 100644
--- a/tests/Tracy/expected/Debugger.exception.generator.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.generator.html.expect
@@ -66,7 +66,7 @@
 		

 			
 
-			
+			

 
$arg1

 

 			

@@ -83,7 +83,7 @@
 		

 			
 
-			
+			

 
$arg1
true

 

 
$arg2
false

@@ -102,7 +102,7 @@
 		

 			
 
-			
+			

 
$arg1

 

 
$arg2
'any string'

diff --git a/tests/Tracy/expected/Debugger.exception.html.expect b/tests/Tracy/expected/Debugger.exception.html.expect
index 0608ac45a..a30da6a0a 100644
--- a/tests/Tracy/expected/Debugger.exception.html.expect
+++ b/tests/Tracy/expected/Debugger.exception.html.expect
@@ -84,7 +84,7 @@
 %d%:    function third($arg1)
 
 
-			
+			

 
$arg1

 

 			

@@ -116,7 +116,7 @@
 %d%:    function second($arg1, $arg2)
 
 
-			
+			

 
$arg1
true

 

 
$arg2
false

@@ -146,7 +146,7 @@
 %d%:    first(10, 'any string');
 
 
-			
+			

 
$arg1
10

 

 
$arg2
'any string'

@@ -189,7 +189,7 @@
 
 		

 			

-				
+				

 				%A%
 				

 			

@@ -199,7 +199,7 @@
 
 
 			

-				
+				

 				%A%
 				

 			

@@ -250,7 +250,7 @@
 			

 			
Code: %d%

 			

-				%A%

+				%A%

 			

 
 
diff --git a/tests/Tracy/expected/Debugger.strict.html.expect b/tests/Tracy/expected/Debugger.strict.html.expect
index 6c0d14b74..067841bbc 100644
--- a/tests/Tracy/expected/Debugger.strict.html.expect
+++ b/tests/Tracy/expected/Debugger.strict.html.expect
@@ -54,7 +54,7 @@
 		

 			
 
-			
+			

 
$arg1

 

 			

@@ -71,7 +71,7 @@
 		

 			
 
-			
+			

 
$arg1
true

 

 
$arg2
false

@@ -90,7 +90,7 @@
 		

 			
 
-			
+			

 
$arg1
%d%

 

 
$arg2
'any string'

@@ -128,7 +128,7 @@
 
 		

 			

-				
+				

 				%A%
 				

 			

@@ -138,7 +138,7 @@
 
 
 			

-				
+				

 				%A%
 				

 			

@@ -189,7 +189,7 @@
 			

 			
Code: %d%

 			

-				%A%

+				%A%