diff --git a/frontend/app/admin/admin.component.css b/frontend/app/admin/admin.component.css index cdadcf81..e69de29b 100644 --- a/frontend/app/admin/admin.component.css +++ b/frontend/app/admin/admin.component.css @@ -1,5 +0,0 @@ -#login-card { -} -body { - background: #eee; -} \ No newline at end of file diff --git a/frontend/app/gallery/lightbox/lightbox.gallery.component.css b/frontend/app/gallery/lightbox/lightbox.gallery.component.css index 90f1f200..aeee981d 100644 --- a/frontend/app/gallery/lightbox/lightbox.gallery.component.css +++ b/frontend/app/gallery/lightbox/lightbox.gallery.component.css @@ -3,8 +3,8 @@ z-index: 1100; /* Sit on top */ left: 0; top: 0; - width: 0px; /* Full width */ - height: 0px; /* Full height */ + width: 0; /* Full width */ + height: 0; /* Full height */ overflow: hidden; display: flex; /* add */ justify-content: center; /* add to align horizontal */ diff --git a/frontend/app/gallery/photo/photo.gallery.component.css b/frontend/app/gallery/photo/photo.gallery.component.css index 35aea235..c81bd0b9 100644 --- a/frontend/app/gallery/photo/photo.gallery.component.css +++ b/frontend/app/gallery/photo/photo.gallery.component.css @@ -1,5 +1,4 @@ img { width: inherit; height: inherit; - vertical-align: inherit; } \ No newline at end of file diff --git a/frontend/app/login/login.component.css b/frontend/app/login/login.component.css index cdadcf81..c0f1b2d2 100644 --- a/frontend/app/login/login.component.css +++ b/frontend/app/login/login.component.css @@ -1,5 +1,3 @@ -#login-card { -} body { background: #eee; } \ No newline at end of file diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 5264ee1d..43f2a9be 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -1,11 +1,13 @@ var webpack = require('webpack'); var CommonsChunkPlugin = require("webpack/lib/optimize/CommonsChunkPlugin"); +var path = require("path"); + module.exports = { entry: { - 'app': __dirname+'/main.ts' + 'app': path.join(__dirname,'/main.ts') }, output: { - filename: __dirname+'/dist/[name]-bundle.js', + filename: path.join(__dirname,'/dist/[name]-bundle.js'), library: ['peer'] }, // Turn on sourcemaps diff --git a/karma.conf.js b/karma.conf.js index c11ec10a..f24dd54e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,7 +1,6 @@ -// @AngularClass +var testWebpackConfig = require('./test/webpack.test.config.js'); module.exports = function(config) { - var testWebpackConfig = require('./test/webpack.test.config.js'); config.set({