Commit aaf3da61 authored by LianaHus's avatar LianaHus

fixed the border between terminal and editor status line

replaced gas image with fa icon
parent ec0a68c6
...@@ -40,7 +40,8 @@ class ContextView { ...@@ -40,7 +40,8 @@ class ContextView {
} }
render () { render () {
const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} badge bg-light border-0"> const view = yo`
<div class="${css.contextview} ${css.contextviewcontainer} bg-light text-dark border-0">
<div class=${css.container}> <div class=${css.container}>
${this._renderTarget()} ${this._renderTarget()}
</div> </div>
...@@ -156,24 +157,28 @@ class ContextView { ...@@ -156,24 +157,28 @@ class ContextView {
const showGasEstimation = () => { const showGasEstimation = () => {
if (node.name === 'FunctionDefinition') { if (node.name === 'FunctionDefinition') {
const result = this.contextualListener.gasEstimation(node) const result = this.contextualListener.gasEstimation(node)
const executionCost = 'Execution cost: ' + result.executionCost + ' gas' const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas' const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}` const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
return yo`<div class=${css.gasEstimation}> return yo`
<img class=${css.gasStationIcon} title='Gas estimation' src='assets/img/gasStation_50.png'> <div class=${css.gasEstimation}>
${estimatedGas} <i class="fas fa-gas-pump ${css.gasStationIcon}" title='Gas estimation'></i>
</div>` <span>${estimatedGas}</span>
</div>
`
} }
} }
return yo`<div class=${css.line}>${showGasEstimation()} return yo`
<div class=${css.line}>${showGasEstimation()}
<div title=${type} class=${css.type}>${type}</div> <div title=${type} class=${css.type}>${type}</div>
<div title=${node.attributes.name} class=${css.name}>${node.attributes.name}</div> <div title=${node.attributes.name} class=${css.name}>${node.attributes.name}</div>
<i class="fas fa-share ${css.jump}" aria-hidden="true" onclick=${jumpTo}></i> <i class="fas fa-share ${css.jump}" aria-hidden="true" onclick=${jumpTo}></i>
<span class=${css.referencesnb}>${references}</span> <span class=${css.referencesnb}>${references}</span>
<i data-action='previous' class="fas fa-chevron-up ${css.jump}" aria-hidden="true" onclick=${jump}></i> <i data-action='previous' class="fas fa-chevron-up ${css.jump}" aria-hidden="true" onclick=${jump}></i>
<i data-action='next' class="fas fa-chevron-down ${css.jump}" aria-hidden="true" onclick=${jump}></i> <i data-action='next' class="fas fa-chevron-down ${css.jump}" aria-hidden="true" onclick=${jump}></i>
</div>` </div>
`
} }
} }
......
...@@ -4,7 +4,7 @@ var css = csjs` ...@@ -4,7 +4,7 @@ var css = csjs`
.contextview { .contextview {
opacity : 1; opacity : 1;
position : relative; position : relative;
height : 20px; height : 25px;
} }
.container { .container {
padding : 1px 15px; padding : 1px 15px;
...@@ -37,13 +37,17 @@ var css = csjs` ...@@ -37,13 +37,17 @@ var css = csjs`
margin-left : 15px; margin-left : 15px;
} }
.gasEstimation { .gasEstimation {
margin-right: 15px; margin-right : 15px;
display: flex; display : flex;
align-items: center; align-items : center;
} }
.gasStationIcon { .gasStationIcon {
height: 13px; margin-right : 5px;
margin-right: 5px; }
.contextviewcontainer {
z-index : 50;
border-radius : 1px;
border : 2px solid var(--secondary);
} }
.contextviewcontainer{ .contextviewcontainer{
z-index : 50; z-index : 50;
......
...@@ -136,7 +136,7 @@ class Terminal extends BaseApi { ...@@ -136,7 +136,7 @@ class Terminal extends BaseApi {
self._view.bar = yo` self._view.bar = yo`
<div class="${css.bar}"> <div class="${css.bar}">
${self._view.dragbar} ${self._view.dragbar}
<div class="${css.menu} border-top bg-light"> <div class="${css.menu} border-top border-dark bg-light">
${self._view.icon} ${self._view.icon}
<div class=${css.clear} onclick=${clear}> <div class=${css.clear} onclick=${clear}>
<i class="fas fa-ban" aria-hidden="true" title="Clear console" <i class="fas fa-ban" aria-hidden="true" title="Clear console"
......
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