diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-07-21 03:38:38 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-07-21 03:38:38 +0800 |
| commit | 86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6 (patch) | |
| tree | b4a6805e5e2a4de48c880d80f4b87d1f3b560a18 /app | |
| parent | 199587383b022a17d56adcb56d6a99ceba71fec7 (diff) | |
| download | tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar.gz tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar.bz2 tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar.lz tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar.xz tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.tar.zst tangerine-wallet-browser-86d367957fe8ac04462f716fe0ba2bfa4e5ff3f6.zip | |
Move responsive ui into its own folder for easier merges
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/popup-core.js | 2 | ||||
| -rw-r--r-- | app/scripts/popup.js | 2 | ||||
| -rw-r--r-- | app/scripts/responsive-core.js | 2 | ||||
| -rw-r--r-- | app/scripts/responsive.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index 156be795a..f1eb394d7 100644 --- a/app/scripts/popup-core.js +++ b/app/scripts/popup-core.js @@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter const async = require('async') const Dnode = require('dnode') const EthQuery = require('eth-query') -const launchMetamaskUi = require('../../ui/classic') +const launchMetamaskUi = require('../../ui') const StreamProvider = require('web3-stream-provider') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 13b98d1f6..5f17f0651 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -1,5 +1,5 @@ const injectCss = require('inject-css') -const MetaMaskUiCss = require('../../ui/classic/css') +const MetaMaskUiCss = require('../../ui/css') const startPopup = require('./popup-core') const PortStream = require('./lib/port-stream.js') const isPopupOrNotification = require('./lib/is-popup-or-notification') diff --git a/app/scripts/responsive-core.js b/app/scripts/responsive-core.js index 3760facfa..c3fa6700d 100644 --- a/app/scripts/responsive-core.js +++ b/app/scripts/responsive-core.js @@ -2,7 +2,7 @@ const EventEmitter = require('events').EventEmitter const async = require('async') const Dnode = require('dnode') const EthQuery = require('eth-query') -const launchMetamaskUi = require('../../ui/responsive') +const launchMetamaskUi = require('../../responsive-ui') const StreamProvider = require('web3-stream-provider') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex diff --git a/app/scripts/responsive.js b/app/scripts/responsive.js index 0ff42a4cb..6525b833b 100644 --- a/app/scripts/responsive.js +++ b/app/scripts/responsive.js @@ -1,6 +1,6 @@ const injectCss = require('inject-css') const startPopup = require('./responsive-core') -const MetaMaskUiCss = require('../../ui/responsive/css') +const MetaMaskUiCss = require('../../responsive-ui/css') const PortStream = require('./lib/port-stream.js') const ExtensionPlatform = require('./platforms/extension') const extension = require('extensionizer') |