diff options
| author | Le Quoc Viet <vietlq85@gmail.com> | 2018-03-15 16:11:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 16:11:42 +0800 |
| commit | 04079455e36e48433cf8055c8f1f79e1e7e18298 (patch) | |
| tree | d7de2a6603b67b56abacf09bee4d2bbbfe886b8f /ui/css.js | |
| parent | 5bdee96e73f65a0b369277e9c56b0afe5159e65b (diff) | |
| parent | e2efc91aee64072c408ab509219dcbfb389c7609 (diff) | |
| download | tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.gz tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.zst tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.zip | |
Merge pull request #1 from MetaMask/master
Merge from the source
Diffstat (limited to 'ui/css.js')
| -rw-r--r-- | ui/css.js | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -4,11 +4,8 @@ const path = require('path') module.exports = bundleCss var cssFiles = { - 'fonts.css': fs.readFileSync(path.join(__dirname, '/app/css/fonts.css'), 'utf8'), - 'reset.css': fs.readFileSync(path.join(__dirname, '/app/css/reset.css'), 'utf8'), - 'lib.css': fs.readFileSync(path.join(__dirname, '/app/css/lib.css'), 'utf8'), - 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/index.css'), 'utf8'), - 'transitions.css': fs.readFileSync(path.join(__dirname, '/app/css/transitions.css'), 'utf8'), + 'index.css': fs.readFileSync(path.join(__dirname, '/app/css/output/index.css'), 'utf8'), + 'first-time.css': fs.readFileSync(path.join(__dirname, '../mascara/src/app/first-time/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'), } |