Update safari settings for saucelabs

pull/1/head
ninabreznik 8 years ago
parent f2276b66cf
commit 7c126e0d12
  1. 15
      assets/css/universal-dapp.css
  2. 4
      nightwatch.js
  3. 2
      src/app/contract-tab.js
  4. 12
      src/app/renderer.js
  5. 16
      src/app/settings-tab.js

@ -303,15 +303,22 @@
} }
.udapp .legend { .udapp .legend {
font-size: 12px; background-color: white;
float: left; line-height: 20px;
color: #666; border: .2em dotted lightGrey;
padding: 8px 15px;
border-radius: 5px;
margin-bottom: 1em;
display: flex;
justify-content: space-around;
} }
.udapp .legend div { .udapp .legend div {
display: inline-block; display: inline-block;
margin-right: 0.5em; margin-right: 0.5em;
margin-bottom: 1em; display: flex;
align-items: center;
line-height: 0px;
} }
.udapp .legend div:before { .udapp .legend div:before {

@ -50,8 +50,8 @@ module.exports = {
'desiredCapabilities': { 'desiredCapabilities': {
'browserName': 'safari', 'browserName': 'safari',
'javascriptEnabled': true, 'javascriptEnabled': true,
'platform': 'OS X 10.10', 'platform': 'OS X 10.11',
'version': '8.0', 'version': '10.0',
'acceptSslCerts': true, 'acceptSslCerts': true,
'build': 'build-' + TRAVIS_JOB_NUMBER, 'build': 'build-' + TRAVIS_JOB_NUMBER,
'tunnel-identifier': 'browsersolidity_tests_' + TRAVIS_JOB_NUMBER 'tunnel-identifier': 'browsersolidity_tests_' + TRAVIS_JOB_NUMBER

@ -35,7 +35,7 @@ var css = csjs`
} }
.contract { .contract {
display: block; display: block;
margin: 5em 0 2em 0; margin: 4em 0 2em 0;
} }
` `

@ -18,13 +18,19 @@ var css = csjs`
width: 30%; width: 30%;
float: left; float: left;
} }
.toggle { .toggleText {
font-size: 1em;
text-decoration: underline; text-decoration: underline;
margin-left: 2px;
font-size: .9em;
}
.toggle {
font-size: 1.1em;
color: ${styles.colors.blue}; color: ${styles.colors.blue};
margin: 1em; margin: 1em;
cursor: pointer; cursor: pointer;
font-weight: 400; font-weight: 400;
display: flex;
align-items: center;
} }
.toggle:hover { .toggle:hover {
opacity: .8; opacity: .8;
@ -248,7 +254,7 @@ Renderer.prototype.contracts = function (data, source) {
var detailsOpen = {} var detailsOpen = {}
var getDetails = function (contract, source, contractName) { var getDetails = function (contract, source, contractName) {
var button = $(`<div class="${css.toggle}"><i class="fa fa-info-circle" aria-hidden="true"></i> Contract details (bytecode, interface etc.)</div>`) var button = $(`<div class="${css.toggle}"><i class="fa fa-info-circle" aria-hidden="true"></i><div class="${css.toggleText}">Contract details (bytecode, interface etc.)</div></div>`)
var details = $('<div style="display: none;"/>') var details = $('<div style="display: none;"/>')
if (contract.bytecode) { if (contract.bytecode) {

@ -28,10 +28,12 @@ var css = csjs`
text-align: -webkit-center; text-align: -webkit-center;
} }
.col1 extends ${styles.titleL} { .col1 extends ${styles.titleL} {
width: 30%;
float: left; float: left;
align-self: center; align-self: center;
} }
.checkboxText {
margin-left: 3px;
}
} }
` `
module.exports = settingsTab module.exports = settingsTab
@ -47,16 +49,16 @@ function settingsTab () {
<select class="${css.select}" id="versionSelector"></select> <select class="${css.select}" id="versionSelector"></select>
</div> </div>
<div class="${css.crow}"> <div class="${css.crow}">
Text Wrap <div><input class="${css.col1}" id="editorWrap" type="checkbox"></div>
<input class="${css.col1}" id="editorWrap" type="checkbox"> <span class="${css.checkboxText}">Text Wrap</span>
</div> </div>
<div class="${css.crow}"> <div class="${css.crow}">
Enable Optimization <div><input class="${css.col1}" id="optimize" type="checkbox"></div>
<input id="optimize" type="checkbox"> <span class="${css.checkboxText}">Enable Optimization</span>
</div> </div>
<div class="${css.crow}"> <div class="${css.crow}">
Auto Compile <div><input class="${css.col1}" id="autoCompile" type="checkbox" checked></div>
<input id="autoCompile" type="checkbox" checked> <span class="${css.checkboxText}">Auto Compile</span>
</div> </div>
</div> </div>
<div class="${css.crow}"> <div class="${css.crow}">

Loading…
Cancel
Save