Skip to content

B
baas-ide
Commit aaf3da61 authored by LianaHus's avatar LianaHus
Browse files
Options

fixed the border between terminal and editor status line

replaced gas image with fa icon
parent ec0a68c6
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 32 deletions
src/app/editor/contextView.js
View file @ aaf3da61
...@@ -40,11 +40,12 @@ class ContextView { ...@@ -40,11 +40,12 @@ class ContextView {
} }
render () { render () {
const view = yo`<div class="${css.contextview} ${css.contextviewcontainer} badge bg-light border-0"> const view = yo`
<div class=${css.container}> <div class="${css.contextview} ${css.contextviewcontainer} bg-light text-dark border-0">
${this._renderTarget()} <div class=${css.container}>
</div> ${this._renderTarget()}
</div>` </div>
</div>`
if (!this._view) { if (!this._view) {
this._view = view this._view = view
} }
...@@ -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 title=${type} class=${css.type}>${type}</div> <div class=${css.line}>${showGasEstimation()}
<div title=${node.attributes.name} class=${css.name}>${node.attributes.name}</div> <div title=${type} class=${css.type}>${type}</div>
<i class="fas fa-share ${css.jump}" aria-hidden="true" onclick=${jumpTo}></i> <div title=${node.attributes.name} class=${css.name}>${node.attributes.name}</div>
<span class=${css.referencesnb}>${references}</span> <i class="fas fa-share ${css.jump}" aria-hidden="true" onclick=${jumpTo}></i>
<i data-action='previous' class="fas fa-chevron-up ${css.jump}" aria-hidden="true" onclick=${jump}></i> <span class=${css.referencesnb}>${references}</span>
<i data-action='next' class="fas fa-chevron-down ${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>
</div>` <i data-action='next' class="fas fa-chevron-down ${css.jump}" aria-hidden="true" onclick=${jump}></i>
</div>
`
} }
} }
......
src/app/editor/styles/contextView-styles.js
View file @ aaf3da61
var csjs = require('csjs-inject') var csjs = require('csjs-inject')
var css = csjs` 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;
} }
.line { .line {
display : flex; display : flex;
justify-content : flex-end; justify-content : flex-end;
align-items : center; align-items : center;
...@@ -18,32 +18,36 @@ var css = csjs` ...@@ -18,32 +18,36 @@ var css = csjs`
white-space : nowrap; white-space : nowrap;
font-size : 13px; font-size : 13px;
} }
.type { .type {
font-style : italic; font-style : italic;
margin-right : 5px; margin-right : 5px;
} }
.name { .name {
font-weight : bold; font-weight : bold;
} }
.jump { .jump {
cursor : pointer; cursor : pointer;
margin : 0 5px; margin : 0 5px;
} }
.jump:hover { .jump:hover {
color : var(--secondary); color : var(--secondary);
} }
.referencesnb { .referencesnb {
float : right; float : right;
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;
......
src/app/panels/terminal.js
View file @ aaf3da61
...@@ -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