From 582e5be14fb9876cafb31593e2fbd515da2d97e6 Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Tue, 30 May 2017 15:48:54 +0200 Subject: [PATCH 1/2] Remove reduntant scrollbars --- assets/css/browser-solidity.css | 2 +- src/app/analysis-tab.js | 1 + src/universal-dapp.js | 17 ++++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/assets/css/browser-solidity.css b/assets/css/browser-solidity.css index b2f62e1982..cccee67a60 100644 --- a/assets/css/browser-solidity.css +++ b/assets/css/browser-solidity.css @@ -134,6 +134,7 @@ body { bottom: 0; overflow: auto; box-sizing: border-box; + overflow: hidden; } #header { @@ -150,7 +151,6 @@ body { #header #menu { border-bottom: 3px solid #F4F6FF; - overflow: hidden; height: 2em; font-size: 1em; padding-top: 0.5em; diff --git a/src/app/analysis-tab.js b/src/app/analysis-tab.js index 1d72077a96..569f981d2b 100644 --- a/src/app/analysis-tab.js +++ b/src/app/analysis-tab.js @@ -9,6 +9,7 @@ var css = csjs` .analysisTabView { padding: 2%; margin-top: 1em; + padding-bottom: 3em; } .infoBox extends ${styles.infoTextBox} { margin-bottom: 1em; diff --git a/src/universal-dapp.js b/src/universal-dapp.js index 4767cd405f..17b64b0ac2 100644 --- a/src/universal-dapp.js +++ b/src/universal-dapp.js @@ -21,14 +21,17 @@ var styleGuide = require('./app/style-guide') var styles = styleGuide() var css = csjs` + html { + overflow: hidden; + } .options { - float: left; - padding: 0.7em 0.3em; - font-size: 0.9em; - cursor: pointer; - background-color: transparent; - margin-right: 0.5em; - font-size: 1em; + float: left; + padding: 0.7em 0.3em; + font-size: 0.9em; + cursor: pointer; + background-color: transparent; + margin-right: 0.5em; + font-size: 1em; } .title extends ${styles.titleBox} { cursor: pointer; From cd1d564c04ab3fd2b51504f7888961d2e4a636f4 Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 15 Jun 2017 10:28:21 +0200 Subject: [PATCH 2/2] fix test --- test-browser/tests/compiling.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js index 3487f147f3..4adb8a3e6b 100644 --- a/test-browser/tests/compiling.js +++ b/test-browser/tests/compiling.js @@ -33,7 +33,11 @@ function runTests (browser) { .click('.instance .call[title="f"]') .waitForElementPresent('.output .returned') .assert.containsText('.output .returned', '0x0000000000000000000000000000000000000000000000000000000000000008') - .assert.containsText('.output .decoded li', 'uint256: 8') - .end() + .execute(function () { + document.querySelector('.output .decoded li').scrollIntoView() + }, [], function () { + browser.assert.containsText('.output .decoded li', 'uint256: 8') + .end() + }) }) }