Skip to content

Commit 86a6ad3

Browse files
committed
more css updates
1 parent 2ca8b66 commit 86a6ad3

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

apps/remix-ide/src/app/components/styles/bottom-bar.css

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,13 @@
114114
}
115115

116116
.bottom-bar .debug-btn.btn-secondary:hover:not(:disabled) {
117-
background-color: var(--bs-primary, #0d6efd);
117+
background-color: var(--bs-btn-bg);
118118
color: white;
119119
transform: translateY(-1px);
120120
}
121121

122-
.bottom-bar .debug-btn.btn-primary {
123-
background-color: var(--bs-primary, #0d6efd);
124-
color: white;
125-
font-weight: 700;
126-
}
127-
128122
.bottom-bar .debug-btn.btn-primary:hover:not(:disabled) {
129-
filter: brightness(1.15);
123+
/* filter: brightness(1.15); */
130124
transform: translateY(-1px);
131125
}
132126

libs/remix-ui/debugger-ui/src/lib/debug-layout/debug-layout.css

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
display: flex;
344344
align-items: center;
345345
padding: 2px 5px;
346-
height: 24px;
346+
height: 22px;
347347
font-size: 11px;
348348
border: none;
349349
border-radius: 10px;
@@ -377,7 +377,6 @@
377377
/* JSON Renderer Styles */
378378
.json-renderer {
379379
font-size: 0.75rem;
380-
font-family: 'Courier New', monospace;
381380
line-height: 1.6;
382381
padding: 0.75rem;
383382
padding-bottom: 0;
@@ -421,8 +420,7 @@
421420
}
422421

423422
.json-key {
424-
color: #20c997;
425-
font-weight: 600;
423+
color: rgba(var(--bs-secondary-rgb), var(1)) !important;
426424
word-wrap: break-word;
427425
word-break: break-word;
428426
overflow-wrap: break-word;
@@ -435,7 +433,7 @@
435433
}
436434

437435
.json-value {
438-
color: #ffc107;
436+
color: var(--bs-warning);
439437
font-weight: 500;
440438
word-wrap: break-word;
441439
word-break: break-word;

libs/remix-ui/debugger-ui/src/lib/debug-layout/debug-layout.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ export const DebugLayout = ({
575575
</>
576576
)}
577577
</span>
578-
{/* Navigation action buttons */}
579-
{!scope.isSenderNode && (opcode === 'CALL' || opcode === 'DELEGATECALL' || opcode === 'STATICCALL' ||
578+
{/* Navigation action buttons - show for external calls and parent calls with children */}
579+
{!scope.isSenderNode && (hasChildren || opcode === 'CALL' || opcode === 'DELEGATECALL' || opcode === 'STATICCALL' ||
580580
opcode === 'CREATE' || opcode === 'CREATE2' || callTypeLabel === 'INTERNAL') && (
581581
<div className="call-trace-actions">
582582
{scope.firstStep !== undefined && (
@@ -585,7 +585,9 @@ export const DebugLayout = ({
585585
onClick={(e) => {
586586
e.stopPropagation()
587587
if (stepManager && stepManager.jumpTo) {
588-
stepManager.jumpTo(scope.firstStep + 2) // After the JUMPDEST
588+
// Use functionEntryStep if available (skips dispatcher), otherwise use firstStep
589+
const stepToJump = scope.functionEntryStep !== undefined ? scope.functionEntryStep : scope.firstStep
590+
stepManager.jumpTo(stepToJump)
589591
}
590592
}}
591593
>
@@ -780,19 +782,17 @@ export const DebugLayout = ({
780782
? receipt.logs
781783
: 'No events emitted'
782784

783-
const objectData: any = {
784-
parameters: parameters,
785-
returnValues: returnValues
786-
}
787-
788785
// Debug logging
789786
console.log('[DebugLayout] solidityLocals:', solidityLocals)
790787
console.log('[DebugLayout] solidityState:', solidityState)
791788

792-
// Always add locals and state sections
793-
// Show empty object if no data, or the actual data
794-
objectData.locals = solidityLocals || 'No local variables at current step'
795-
objectData.state = solidityState || 'No state variables at current step'
789+
// Build objectData with returnValues at the end
790+
const objectData: any = {
791+
parameters: parameters,
792+
locals: solidityLocals || 'No local variables at current step',
793+
state: solidityState || 'No state variables at current step',
794+
returnValues: returnValues
795+
}
796796

797797
if (activeObjectTab === 'json') {
798798
return (

0 commit comments

Comments
 (0)