Merge pull request #1946 from ethereum/master_l

paddings and margins for swap tabs
pull/1/head
yann300 6 years ago committed by GitHub
commit e7109135e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/app/staticanalysis/staticAnalysisView.js
  2. 3
      src/app/staticanalysis/styles/staticAnalysisView-styles.js
  3. 2
      src/app/tabs/run-tab.js
  4. 2
      src/app/tabs/runTab/settings.js
  5. 1
      src/app/tabs/styles/run-tab-styles.js
  6. 7
      src/app/tabs/styles/test-tab-styles.js
  7. 9
      src/app/tabs/test-tab.js

@ -68,9 +68,8 @@ staticAnalysisView.prototype.render = function () {
<div id="staticanalysismodules" class="list-group list-group-flush ${css.container}"> <div id="staticanalysismodules" class="list-group list-group-flush ${css.container}">
${this.modulesView} ${this.modulesView}
</div> </div>
<hr> <div class="${css.resultTitle} mx-2"><h6>Results:</h6></div>
<div><h6>Results:</h6></div> <div class="${css.result} m-2" id='staticanalysisresult'></div>
<div class="${css.result}" id='staticanalysisresult'></div>
</div> </div>
` `
if (!this.view) { if (!this.view) {

@ -9,6 +9,9 @@ var css = csjs`
margin-top: 1%; margin-top: 1%;
max-height: 300px; max-height: 300px;
} }
.resultTitle {
padding-top: 20px;
}
.buttons { .buttons {
margin: 1rem 0; margin: 1rem 0;
} }

@ -44,7 +44,7 @@ class RunTab extends BaseApi {
} }
renderContainer () { renderContainer () {
this.container = yo`<div class="${css.runTabView}" id="runTabView" ></div>` this.container = yo`<div class="${css.runTabView} p-3" id="runTabView" ></div>`
var el = yo` var el = yo`
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">

@ -109,7 +109,7 @@ class SettingsUI {
<div class="${css.col1_1}">Value</div> <div class="${css.col1_1}">Value</div>
<div class="${css.gasValueContainer}"> <div class="${css.gasValueContainer}">
<input type="text" class="form-control ${css.gasNval} ${css.col2}" id="value" value="0" title="Enter the value and choose the unit"> <input type="text" class="form-control ${css.gasNval} ${css.col2}" id="value" value="0" title="Enter the value and choose the unit">
<select name="unit" class="form-control ${css.gasNvalUnit} ${css.col2_2}" id="unit"> <select name="unit" class="form-control p-1 ${css.gasNvalUnit} ${css.col2_2}" id="unit">
<option data-unit="wei">wei</option> <option data-unit="wei">wei</option>
<option data-unit="gwei">gwei</option> <option data-unit="gwei">gwei</option>
<option data-unit="finney">finney</option> <option data-unit="finney">finney</option>

@ -236,6 +236,7 @@ var css = csjs`
/* transform-origin: left; */ /* transform-origin: left; */
margin-right: 10px; margin-right: 10px;
font-size: 0.8rem; font-size: 0.8rem;
width: 70px;
} }
` `

@ -3,14 +3,14 @@ var csjs = require('csjs-inject')
var css = csjs` var css = csjs`
.testTabView {} .testTabView {}
.infoBox { .infoBox {
margin: 2%; margin: 5%;
} }
.tests {} .tests {}
.testList { .testList {
line-height: 2em; line-height: 2em;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 2%; margin: 5%;
max-height: 300px; max-height: 300px;
overflow-y: auto; overflow-y: auto;
@ -40,13 +40,14 @@ var css = csjs`
.testFailureSummary { .testFailureSummary {
} }
.buttons { .buttons {
margin: 2%; margin: 5%;
display: flex; display: flex;
align-items: center; align-items: center;
} }
.runButton { .runButton {
} }
.generateTestFile { .generateTestFile {
margin-top: 20px;
min-width: 100px min-width: 100px
} }
.title { .title {

@ -160,7 +160,7 @@ module.exports = class TestTab extends BaseApi {
} }
render () { render () {
this.testsOutput = yo`<div class="${css.container} border border-primary border-right-0 border-left-0 border-bottom-0" hidden='true' id="tests"></div>` this.testsOutput = yo`<div class="${css.container} m-3 border border-primary border-right-0 border-left-0 border-bottom-0" hidden='true' id="tests"></div>`
this.testsSummary = yo`<div class="${css.container} border border-primary border-right-0 border-left-0 border-bottom-0" hidden='true' id="tests"></div>` this.testsSummary = yo`<div class="${css.container} border border-primary border-right-0 border-left-0 border-bottom-0" hidden='true' id="tests"></div>`
this.loading = yo`<span class='text-info ml-1'>Running tests...</span>` this.loading = yo`<span class='text-info ml-1'>Running tests...</span>`
this.loading.hidden = true this.loading.hidden = true
@ -175,12 +175,13 @@ module.exports = class TestTab extends BaseApi {
<br/> <br/>
For more details, see For more details, see
How to test smart contracts guide in our documentation. How to test smart contracts guide in our documentation.
<div class="${css.generateTestFile} btn btn-primary m-1" onclick="${this.testTabLogic.generateTestFile.bind(this.testTabLogic)}">Generate test file</div> <br/>
<div class="${css.generateTestFile} btn btn-secondary" onclick="${this.testTabLogic.generateTestFile.bind(this.testTabLogic)}">Generate test file</div>
</div> </div>
<div class="${css.tests}"> <div class="${css.tests}">
<div class="${css.buttons}"> <div class="${css.buttons}">
<div class="${css.runButton} btn btn-primary m-1" onclick="${this.runTests.bind(this)}">Run Tests</div> <div class="${css.runButton} btn btn-primary" onclick="${this.runTests.bind(this)}">Run Tests</div>
<label class="${css.label}" for="checkAllTests"> <label class="${css.label} mx-4 m-2" for="checkAllTests">
<input id="checkAllTests" <input id="checkAllTests"
type="checkbox" type="checkbox"
onclick="${(event) => { this.checkAll(event) }}" onclick="${(event) => { this.checkAll(event) }}"

Loading…
Cancel
Save