From 36049b6c83b8a1f93a993ea9ed0d03fb58bf702d Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Fri, 26 May 2017 21:17:36 +0200 Subject: [PATCH 1/7] Restyle compilation warning --- src/app/settings-tab.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/settings-tab.js b/src/app/settings-tab.js index 02acd37e40..9875854f38 100644 --- a/src/app/settings-tab.js +++ b/src/app/settings-tab.js @@ -34,8 +34,8 @@ var css = csjs` .checkboxText { margin-left: 3px; } - #warnCompilationSlow { - color: #FF8B8B; + .compilationWarning extends ${styles.warningTextBox} { + margin-top: 1em; } } ` @@ -61,7 +61,8 @@ function settingsTab () {
- Auto Compile + Auto Compile +
From fb74c846420b8092d59504384a711d980dd9a501 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 29 May 2017 14:56:10 +0200 Subject: [PATCH 2/7] use span instead of div (so it won't modify the height of the panel when the warning is displayed) --- src/app/settings-tab.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/settings-tab.js b/src/app/settings-tab.js index 9875854f38..416710da28 100644 --- a/src/app/settings-tab.js +++ b/src/app/settings-tab.js @@ -36,6 +36,7 @@ var css = csjs` } .compilationWarning extends ${styles.warningTextBox} { margin-top: 1em; + margin-left: 0.5em; } } ` @@ -62,7 +63,7 @@ function settingsTab () {
Auto Compile -
+
From 2fd33750691fbb4ae9703faf11df83f94bfcdc65 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 29 May 2017 14:56:21 +0200 Subject: [PATCH 3/7] hide/show --- src/app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app.js b/src/app.js index 6565bb6e83..034c13915c 100644 --- a/src/app.js +++ b/src/app.js @@ -800,8 +800,10 @@ var run = function () { var warnMsg = ' Last compilation took {X}ms. We suggest to turn off autocompilation.' compiler.event.register('compilationDuration', (speed) => { $('#warnCompilationSlow').html('') + $('#warnCompilationSlow').hide() $('#header #menu .settingsView').css('color', '') if (speed > 1000) { + $('#warnCompilationSlow').show() $('#warnCompilationSlow').html(warnMsg.replace('{X}', speed)) $('#header #menu .settingsView').css('color', '#FF8B8B') } From b73bdf10a27e75914e1ec7204f3ecdc7ff62f74a Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 29 May 2017 18:59:30 +0200 Subject: [PATCH 4/7] Move compilation warning under Compile button --- src/app/settings-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/settings-tab.js b/src/app/settings-tab.js index 416710da28..10040a79e2 100644 --- a/src/app/settings-tab.js +++ b/src/app/settings-tab.js @@ -63,12 +63,12 @@ function settingsTab () {
Auto Compile -
Compile
+
` } From ee3877944e22973bfbe877fe5ec3d1b0f7d2abfd Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 29 May 2017 22:08:05 +0200 Subject: [PATCH 5/7] Remove empty warning box when no message --- src/app.js | 11 +++++++++-- src/app/settings-tab.js | 4 ---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app.js b/src/app.js index 034c13915c..19130cff97 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,8 @@ var $ = require('jquery') var base64 = require('js-base64').Base64 var swarmgw = require('swarmgw') var csjs = require('csjs-inject') +var styleGuide = require('./app/style-guide') +var styles = styleGuide() var QueryParams = require('./app/query-params') var queryParams = new QueryParams() @@ -797,15 +799,20 @@ var run = function () { config.set('autoCompile', autoCompile) }) + var css = csjs` + .compilationWarning extends ${styles.warningTextBox} { + margin-top: 1em; + margin-left: 0.5em; + } + ` var warnMsg = ' Last compilation took {X}ms. We suggest to turn off autocompilation.' compiler.event.register('compilationDuration', (speed) => { $('#warnCompilationSlow').html('') $('#warnCompilationSlow').hide() - $('#header #menu .settingsView').css('color', '') if (speed > 1000) { + document.querySelector('#warnCompilationSlow').className=css.compilationWarning $('#warnCompilationSlow').show() $('#warnCompilationSlow').html(warnMsg.replace('{X}', speed)) - $('#header #menu .settingsView').css('color', '#FF8B8B') } }) diff --git a/src/app/settings-tab.js b/src/app/settings-tab.js index 10040a79e2..b1cc4f517c 100644 --- a/src/app/settings-tab.js +++ b/src/app/settings-tab.js @@ -34,10 +34,6 @@ var css = csjs` .checkboxText { margin-left: 3px; } - .compilationWarning extends ${styles.warningTextBox} { - margin-top: 1em; - margin-left: 0.5em; - } } ` module.exports = settingsTab From 0b558939a8e1181db86c4e61cbd5fa5b2914c560 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 30 May 2017 16:33:00 +0200 Subject: [PATCH 6/7] standard code --- src/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app.js b/src/app.js index 19130cff97..2c8348841f 100644 --- a/src/app.js +++ b/src/app.js @@ -799,7 +799,7 @@ var run = function () { config.set('autoCompile', autoCompile) }) - var css = csjs` + var cssCompilationWarning = csjs` .compilationWarning extends ${styles.warningTextBox} { margin-top: 1em; margin-left: 0.5em; @@ -810,7 +810,7 @@ var run = function () { $('#warnCompilationSlow').html('') $('#warnCompilationSlow').hide() if (speed > 1000) { - document.querySelector('#warnCompilationSlow').className=css.compilationWarning + document.querySelector('#warnCompilationSlow').className = cssCompilationWarning.compilationWarning $('#warnCompilationSlow').show() $('#warnCompilationSlow').html(warnMsg.replace('{X}', speed)) } From 1c4eca46d769e83a6a7f4833954ac7dc466807c9 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 30 May 2017 16:34:13 +0200 Subject: [PATCH 7/7] highlight contract tab --- src/app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app.js b/src/app.js index 2c8348841f..ec152e7d6d 100644 --- a/src/app.js +++ b/src/app.js @@ -809,10 +809,12 @@ var run = function () { compiler.event.register('compilationDuration', (speed) => { $('#warnCompilationSlow').html('') $('#warnCompilationSlow').hide() + $('#header #menu .settingsView').css('color', '') if (speed > 1000) { document.querySelector('#warnCompilationSlow').className = cssCompilationWarning.compilationWarning $('#warnCompilationSlow').show() $('#warnCompilationSlow').html(warnMsg.replace('{X}', speed)) + $('#header #menu .settingsView').css('color', '#FF8B8B') } })