replaced colors with bootstrap's once

pull/1/head
LianaHus 5 years ago
parent eca660efc4
commit b04c534322
  1. 12
      src/app/tabs/debugger/debuggerUI/VmDebugger.js
  2. 23
      src/app/tabs/debugger/debuggerUI/vmDebugger/utils/SolidityTypeFormatter.js

@ -123,12 +123,14 @@ function VmDebugger (vmDebuggerLogic) {
}
VmDebugger.prototype.renderHead = function () {
var headView = yo`<div id='vmheadView' class="${css.vmheadView} container">
var headView = yo`
<div id='vmheadView' class="${css.vmheadView} container">
<div class="row" >
<div class="${css.asmCode} column">${this.asmCode.render()}</div>
<div class="${css.stepDetail} column">${this.stepDetail.render()}</div>
</div>
</div>`
</div>
`
if (!this.headView) {
this.headView = headView
}
@ -141,7 +143,8 @@ VmDebugger.prototype.remove = function () {
}
VmDebugger.prototype.render = function () {
var view = yo`<div id='vmdebugger'>
var view = yo`
<div id='vmdebugger'>
<div>
${this.solidityLocals.render()}
${this.solidityState.render()}
@ -153,7 +156,8 @@ VmDebugger.prototype.render = function () {
${this.returnValuesPanel.render()}
${this.fullStoragesChangesPanel.render()}
</div>
</div>`
</div>
`
if (!this.view) {
this.view = view
}

@ -1,6 +1,9 @@
var yo = require('yo-yo')
var BN = require('ethereumjs-util').BN
/* jslint eqeqeq: false */
/* jslint eqeq: false */
module.exports = {
formatSelf: formatSelf,
extractData: extractData
@ -8,11 +11,11 @@ module.exports = {
function formatSelf (key, data) {
var style = fontColor(data)
var keyStyle = data.isProperty ? 'color:#847979' : ''
var keyStyle = data.isProperty ? 'color: var(--info)' : ''
if (data.type === 'string') {
data.self = JSON.stringify(data.self)
}
return yo`<label style=${keyStyle}>${key}: <label style=${style}>${data.self}</label><label style='font-style:italic'> ${data.isProperty || !data.type ? '' : ' ' + data.type}</label></label>`
return yo `<label style='${keyStyle};white-space:pre-wrap;'> ${' ' + key}:<label style=${style}>${' ' + data.self}</label><label style='font-style:italic'> ${data.isProperty || !data.type ? '' : ' ' + data.type}</label></label>`
}
function extractData (item, parent, key) {
@ -55,16 +58,20 @@ function extractData (item, parent, key) {
}
function fontColor (data) {
var color = '#124B46'
var color = 'var(--primary)'
if (data.isArray || data.isStruct || data.isMapping) {
color = '#847979'
} else if (data.type.indexOf('uint') === 0 ||
color = 'var(--info)'
} else if (
data.type.indexOf('uint') === 0 ||
data.type.indexOf('int') === 0 ||
data.type.indexOf('bool') === 0 ||
data.type.indexOf('enum') === 0) {
color = '#0F0CE9'
data.type.indexOf('enum') === 0
) {
color = 'var(--green)'
} else if (data.type === 'string') {
color = '#E91E0C'
color = 'var(--teal)'
} else if (data.self == 0x0) {
color = 'var(--gray)'
}
return 'color:' + color
}

Loading…
Cancel
Save