diff options
| -rw-r--r-- | app/home.html | 1 | ||||
| -rw-r--r-- | app/notification.html | 1 | ||||
| -rw-r--r-- | app/popup.html | 1 | ||||
| -rw-r--r-- | app/scripts/ui.js | 4 | ||||
| -rw-r--r-- | development/mock-dev.js | 10 | ||||
| -rw-r--r-- | gulpfile.js | 4 | ||||
| -rw-r--r-- | package-lock.json | 5 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | ui/app/css/index.scss | 4 | ||||
| -rw-r--r-- | ui/css.js | 25 |
10 files changed, 11 insertions, 45 deletions
diff --git a/app/home.html b/app/home.html index 051133cf8..ac17ed307 100644 --- a/app/home.html +++ b/app/home.html @@ -4,6 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no"> <title>MetaMask</title> + <link rel="stylesheet" type="text/css" href="./index.css"> </head> <body> <div id="app-content"></div> diff --git a/app/notification.html b/app/notification.html index 82bf95ada..eba290c15 100644 --- a/app/notification.html +++ b/app/notification.html @@ -28,6 +28,7 @@ margin-top: 1rem; } </style> + <link rel="stylesheet" type="text/css" href="./index.css"> </head> <body class="notification" style="height:600px;"> <div id="app-content"> diff --git a/app/popup.html b/app/popup.html index 1ba0fda94..3a6709eaf 100644 --- a/app/popup.html +++ b/app/popup.html @@ -4,6 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no"> <title>MetaMask</title> + <link rel="stylesheet" type="text/css" href="./index.css"> </head> <body style="width:357px; height:600px;"> <div id="app-content"></div> diff --git a/app/scripts/ui.js b/app/scripts/ui.js index 67ec6bf06..2dde14b48 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -1,5 +1,3 @@ -const injectCss = require('inject-css') -const NewMetaMaskUiCss = require('../../ui/css') const startPopup = require('./popup-core') const PortStream = require('extension-port-stream') const { getEnvironmentType } = require('./lib/util') @@ -53,8 +51,6 @@ async function start () { global.platform.openExtensionInBrowser() return } - - injectCss(NewMetaMaskUiCss()) }) diff --git a/development/mock-dev.js b/development/mock-dev.js index dafb91266..39b65d24c 100644 --- a/development/mock-dev.js +++ b/development/mock-dev.js @@ -57,13 +57,6 @@ function updateQueryParams (newView) { } // -// CSS -// - -const MetaMaskUiCss = require('../ui/css') -const injectCss = require('inject-css') - -// // MetaMask Controller // @@ -99,9 +92,6 @@ function modifyBackgroundConnection (backgroundConnectionModifier) { actions._setBackgroundConnection(modifiedBackgroundConnection) } -var css = MetaMaskUiCss() -injectCss(css) - // parse opts var store = configureStore(firstState) diff --git a/gulpfile.js b/gulpfile.js index 746860b25..99683bc9f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -85,6 +85,10 @@ createCopyTasks('vendor', { source: './app/vendor/', destinations: commonPlatforms.map(platform => `./dist/${platform}/vendor`), }) +createCopyTasks('css', { + source: './ui/app/css/output/', + destinations: commonPlatforms.map(platform => `./dist/${platform}`), +}) createCopyTasks('reload', { devOnly: true, source: './app/scripts/', diff --git a/package-lock.json b/package-lock.json index d36ba88a4..fcdaea3d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37003,11 +37003,6 @@ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, - "inject-css": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/inject-css/-/inject-css-0.1.1.tgz", - "integrity": "sha1-7z/8eOwCbJbiNV2g3zKRfjUmQVw=" - }, "inline-style-prefixer": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz", diff --git a/package.json b/package.json index 0cbd873e1..5328af4ab 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,6 @@ "fuse.js": "^3.2.0", "gaba": "^1.4.1", "human-standard-token-abi": "^2.0.0", - "inject-css": "^0.1.1", "jazzicon": "^1.2.0", "json-rpc-engine": "^4.0.0", "json-rpc-middleware-stream": "^2.1.1", diff --git a/ui/app/css/index.scss b/ui/app/css/index.scss index ffccbd64f..865b23127 100644 --- a/ui/app/css/index.scss +++ b/ui/app/css/index.scss @@ -16,3 +16,7 @@ @import './itcss/components/index.scss'; @import './itcss/trumps/index.scss'; + +@import '../../../node_modules/react-tooltip-component/dist/react-tooltip-component'; + +@import '../../../node_modules/react-select/dist/react-select'; diff --git a/ui/css.js b/ui/css.js deleted file mode 100644 index d8f954434..000000000 --- a/ui/css.js +++ /dev/null @@ -1,25 +0,0 @@ -const fs = require('fs') -const path = require('path') - -module.exports = bundleCss - -var cssFiles = { - 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/output/index.css'), 'utf8'), - 'react-tooltip-component.css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-tooltip-component', 'dist', 'react-tooltip-component.css'), 'utf8'), - 'react-css': fs.readFileSync(path.join(__dirname, '..', 'node_modules', 'react-select', 'dist', 'react-select.css'), 'utf8'), -} - -function bundleCss () { - var cssBundle = Object.keys(cssFiles).reduce(function (bundle, fileName) { - var fileContent = cssFiles[fileName] - var output = String() - - output += '/*========== ' + fileName + ' ==========*/\n\n' - output += fileContent - output += '\n\n' - - return bundle + output - }, String()) - - return cssBundle -} |