diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-02-28 03:25:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 03:25:29 +0800 |
| commit | 3fefccd37219c9b4b513fc8d929723e07022b9c4 (patch) | |
| tree | 22865ecd672570a6162ac3c9402ec9d63ad3f7ef /ui/css.js | |
| parent | 6a7ea00cd34f83b257f6b4280a5f4e20aa5d34ee (diff) | |
| parent | ced62ac551a095c8f94f550f0c01a9d4fd04ce5b (diff) | |
| download | tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.gz tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.bz2 tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.lz tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.xz tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.zst tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.zip | |
Merge branch 'master' into mascara-deploy
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'), } |