From ee3877944e22973bfbe877fe5ec3d1b0f7d2abfd Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Mon, 29 May 2017 22:08:05 +0200 Subject: [PATCH] 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