From 6787b86170767733e5aa9a3af210d6eeedde543b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 19 Nov 2018 00:37:40 +0100 Subject: [PATCH] Doplneni css pro fullcalendar --- index.js | 3 -- src/assets/scss/app.scss | 2 + webpack.config.js | 95 +++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/index.js b/index.js index 75eb0f6..36a2e8b 100644 --- a/index.js +++ b/index.js @@ -17,6 +17,3 @@ requireAll (require.context ('./src/assets/js', true, /\.js$/)); // SASS import './src/assets/scss/app.scss'; - -// nefunguje kalendar z nejakeho duvodu - mam blbe cestu -// import '~fullcalendar/dist/fullcalendar.css'; \ No newline at end of file diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss index 328b683..766b01c 100644 --- a/src/assets/scss/app.scss +++ b/src/assets/scss/app.scss @@ -15,6 +15,8 @@ @import "~bootstrap/scss/grid"; +@import " ~fullcalendar/dist/fullcalendar.min.css"; + $fa-font-path: "~font-awesome/fonts"; @import '~font-awesome/scss/font-awesome.scss'; diff --git a/webpack.config.js b/webpack.config.js index cf76ca7..2accbd3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,52 +1,49 @@ -const path = require('path'); +const path = require ('path'); module.exports = { - entry: './index.js', - output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist') - }, - module: { - rules: [ - { - test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/, - use: [{ - loader: 'file-loader', - options: { - name: '[name].[ext]', - outputPath: 'fonts/', // where the fonts will go - publicPath: '/dist/fonts' // override the default path - } - }] - }, - { - test: /\.(scss)$/, - use: [ - { - // Adds CSS to the DOM by injecting a `