From 64556806e6f05ebe3c7aa20cc4e628a1f492a65e Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 24 Apr 2017 00:43:58 +0200 Subject: [PATCH] . --- app/src/entry.ts | 2 +- app/src/preload.scss | 1 + app/webpack.config.js | 17 +++-------------- terminus-theme-hype/src/index.ts | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/app/src/entry.ts b/app/src/entry.ts index fe0c9f24..a6be61de 100644 --- a/app/src/entry.ts +++ b/app/src/entry.ts @@ -21,7 +21,7 @@ if ((global).require('electron-is-dev')) { } loadPlugins((current, total) => { - document.querySelector('.progress .bar').style.width = 100 * current / total + '%' + (document.querySelector('.progress .bar')).style.width = 100 * current / total + '%' }).then(async plugins => { let module = await getRootModule(plugins) platformBrowserDynamic().bootstrapModule(module) diff --git a/app/src/preload.scss b/app/src/preload.scss index 989d79fa..56e1b6b3 100644 --- a/app/src/preload.scss +++ b/app/src/preload.scss @@ -2,6 +2,7 @@ $color: rgba(0, 0, 0, 0.5); .preload-logo { + -webkit-app-region: drag; position: fixed; left: 0; top: 0; diff --git a/app/webpack.config.js b/app/webpack.config.js index ceb6ce1b..63de2cf1 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -29,14 +29,8 @@ module.exports = { configFileName: path.resolve(__dirname, 'tsconfig.json'), } }, - { - test: /\.scss$/, - use: ['style-loader', 'css-loader', 'sass-loader'], - }, - { - test: /\.css$/, - use: ['style-loader', 'css-loader', 'sass-loader'], - }, + { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] }, + { test: /\.css$/, use: ['style-loader', 'css-loader', 'sass-loader'] }, { test: /\.(png|svg)$/, loader: "file-loader", @@ -66,10 +60,5 @@ module.exports = { 'path': 'commonjs path', 'rxjs': 'commonjs rxjs', 'zone.js': 'commonjs zone.js', - }, - plugins: [ - new webpack.ProvidePlugin({ - "window.jQuery": "jquery", - }), - ] + } } diff --git a/terminus-theme-hype/src/index.ts b/terminus-theme-hype/src/index.ts index 256125a2..2d6be39f 100644 --- a/terminus-theme-hype/src/index.ts +++ b/terminus-theme-hype/src/index.ts @@ -6,7 +6,7 @@ import { Theme } from 'terminus-core' class HypeTheme extends Theme { name = 'Hype' css = require('./theme.scss') - terminalBackground = '#1D272D' + terminalBackground = '#010101' }