From cf2a5b1d284a0d575bede49efc28403bd2f08daa Mon Sep 17 00:00:00 2001 From: Rob Stupay Date: Wed, 3 Jan 2018 17:08:20 +0100 Subject: [PATCH] adding theme-chooser to every file that loaded the remix-lib - styleguide --- src/app.js | 4 ++-- src/app/editor/contextView.js | 4 ++-- src/app/editor/editor.js | 4 ++-- src/app/execution/txLogger.js | 4 ++-- src/app/files/file-explorer.js | 4 ++-- src/app/panels/editor-panel.js | 4 ++-- src/app/panels/file-panel.js | 4 ++-- src/app/panels/righthand-panel.js | 4 ++-- src/app/staticanalysis/staticAnalysisView.js | 4 ++-- src/app/tabs/analysis-tab.js | 5 ++--- src/app/tabs/compile-tab.js | 5 ++--- src/app/tabs/debugger-tab.js | 5 ++--- src/app/tabs/run-tab.js | 5 ++--- src/app/tabs/support-tab.js | 5 ++--- src/app/tabs/tabbed-menu.js | 5 ++--- src/app/ui/copy-to-clipboard.js | 5 ++--- src/app/ui/dropdown.js | 4 ++-- src/app/ui/modaldialog.js | 5 ++--- src/app/ui/renderer.js | 5 ++--- src/app/ui/tooltip.js | 5 ++--- src/universal-dapp.js | 4 ++-- 21 files changed, 42 insertions(+), 52 deletions(-) diff --git a/src/app.js b/src/app.js index bcdb8fd08c..892aa9626f 100644 --- a/src/app.js +++ b/src/app.js @@ -38,8 +38,8 @@ var ContextualListener = require('./app/editor/contextualListener') var ContextView = require('./app/editor/contextView') var BasicReadOnlyExplorer = require('./app/files/basicReadOnlyExplorer') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('./app/theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` html { box-sizing: border-box; } diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js index b4a3df4485..5e72e80dfb 100644 --- a/src/app/editor/contextView.js +++ b/src/app/editor/contextView.js @@ -2,8 +2,8 @@ var yo = require('yo-yo') var csjs = require('csjs-inject') var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var SourceMappingDecoder = remixLib.SourceMappingDecoder var css = csjs` diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js index 02183b32fb..092299fae7 100644 --- a/src/app/editor/editor.js +++ b/src/app/editor/editor.js @@ -12,8 +12,8 @@ require('brace/ext/language_tools') require('brace/ext/searchbox') var langTools = ace.acequire('ace/ext/language_tools') require('./mode-solidity.js') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() function setTheme (cb) { if (styles.appProperties.aceTheme) { diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index ab7abcc078..9001103bd3 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -5,8 +5,8 @@ var copyToClipboard = require('../ui/copy-to-clipboard') // -------------- styling ---------------------- var csjs = require('csjs-inject') var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var EventManager = remixLib.EventManager var helper = require('../../lib/helper') diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js index 2a6f938083..9fc808bc79 100755 --- a/src/app/files/file-explorer.js +++ b/src/app/files/file-explorer.js @@ -9,8 +9,8 @@ var EventManager = remixLib.EventManager var helper = require('../../lib/helper') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .fileexplorer { diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js index 1414ec554b..6066d48f3b 100644 --- a/src/app/panels/editor-panel.js +++ b/src/app/panels/editor-panel.js @@ -2,8 +2,8 @@ var csjs = require('csjs-inject') var yo = require('yo-yo') var remixLib = require('remix-lib') var EventManager = remixLib.EventManager -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var Terminal = require('./terminal') diff --git a/src/app/panels/file-panel.js b/src/app/panels/file-panel.js index 881fff2cad..8e49a0022d 100644 --- a/src/app/panels/file-panel.js +++ b/src/app/panels/file-panel.js @@ -12,8 +12,8 @@ var QueryParams = require('../../lib/query-params') var queryParams = new QueryParams() var helper = require('../../lib/helper') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() module.exports = filepanel diff --git a/src/app/panels/righthand-panel.js b/src/app/panels/righthand-panel.js index 843a925b55..2800222b89 100644 --- a/src/app/panels/righthand-panel.js +++ b/src/app/panels/righthand-panel.js @@ -13,8 +13,8 @@ var PluginManager = require('../../pluginManager') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` #righthand-panel { diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js index 1805f43e60..1c16eb00f7 100644 --- a/src/app/staticanalysis/staticAnalysisView.js +++ b/src/app/staticanalysis/staticAnalysisView.js @@ -6,8 +6,8 @@ var remixLib = require('remix-lib') var utils = remixLib.util var csjs = require('csjs-inject') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var EventManager = remixLib.EventManager diff --git a/src/app/tabs/analysis-tab.js b/src/app/tabs/analysis-tab.js index 3f8fde60ff..08b7f2bcba 100644 --- a/src/app/tabs/analysis-tab.js +++ b/src/app/tabs/analysis-tab.js @@ -2,9 +2,8 @@ var yo = require('yo-yo') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .analysisTabView { diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index 702d28c75d..5033067a71 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -12,9 +12,8 @@ var copyToClipboard = require('../ui/copy-to-clipboard') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .compileTabView { diff --git a/src/app/tabs/debugger-tab.js b/src/app/tabs/debugger-tab.js index 1fe289baff..9a50551c92 100644 --- a/src/app/tabs/debugger-tab.js +++ b/src/app/tabs/debugger-tab.js @@ -2,9 +2,8 @@ var yo = require('yo-yo') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .debuggerTabView { diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 707720f3e0..f80792bd37 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -13,9 +13,8 @@ var EventManager = require('remix-lib').EventManager // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .runTabView { diff --git a/src/app/tabs/support-tab.js b/src/app/tabs/support-tab.js index be3a52aefb..a19321c1d6 100644 --- a/src/app/tabs/support-tab.js +++ b/src/app/tabs/support-tab.js @@ -2,9 +2,8 @@ var yo = require('yo-yo') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .supportTabView { diff --git a/src/app/tabs/tabbed-menu.js b/src/app/tabs/tabbed-menu.js index 2e38661593..2ce5c89aa9 100644 --- a/src/app/tabs/tabbed-menu.js +++ b/src/app/tabs/tabbed-menu.js @@ -2,9 +2,8 @@ var yo = require('yo-yo') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var helper = require('../../lib/helper') diff --git a/src/app/ui/copy-to-clipboard.js b/src/app/ui/copy-to-clipboard.js index 1ad72032ce..7ce903ab75 100644 --- a/src/app/ui/copy-to-clipboard.js +++ b/src/app/ui/copy-to-clipboard.js @@ -4,9 +4,8 @@ const copy = require('clipboard-copy') var addTooltip = require('./tooltip') // -------------- styling ---------------------- var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .copyIcon { diff --git a/src/app/ui/dropdown.js b/src/app/ui/dropdown.js index 77b0b28633..1a49e63a4d 100644 --- a/src/app/ui/dropdown.js +++ b/src/app/ui/dropdown.js @@ -3,8 +3,8 @@ var remixLib = require('remix-lib') var EventManager = remixLib.EventManager // -------------- styling ---------------------- var csjs = require('csjs-inject') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .dropdown { diff --git a/src/app/ui/modaldialog.js b/src/app/ui/modaldialog.js index 9a5f1a13c6..b2c1b893f7 100644 --- a/src/app/ui/modaldialog.js +++ b/src/app/ui/modaldialog.js @@ -1,8 +1,7 @@ var yo = require('yo-yo') var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = csjs` .modal { diff --git a/src/app/ui/renderer.js b/src/app/ui/renderer.js index 7e21c92ec2..57af92f5cd 100644 --- a/src/app/ui/renderer.js +++ b/src/app/ui/renderer.js @@ -5,9 +5,8 @@ var yo = require('yo-yo') // -------------- styling ---------------------- // var csjs = require('csjs-inject') -var remixLib = require('remix-lib') -var styleGuide = remixLib.ui.styleGuide -var styles = styleGuide() +var styleGuide = require('../theme/theme-chooser') +var styles = styleGuide.chooser() var css = yo`