From e80c8480950ac31cde23b55c4c85b1c9ecb62209 Mon Sep 17 00:00:00 2001
From: Jonathan Treffler <mail@jonathan-treffler.de>
Date: Tue, 11 Aug 2020 11:43:51 +0200
Subject: implemented scss icon loading

Signed-off-by: Jonathan Treffler <mail@jonathan-treffler.de>
---
 css/icons.scss             |  1 +
 css/merged.scss            |  1 +
 src/components/Sidebar.vue |  5 -----
 templates/index.php        |  1 +
 webpack.js                 | 11 ++++++-----
 5 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 css/icons.scss
 create mode 100644 css/merged.scss

diff --git a/css/icons.scss b/css/icons.scss
new file mode 100644
index 000000000..7ae331635
--- /dev/null
+++ b/css/icons.scss
@@ -0,0 +1 @@
+@include icon-black-white('rss', 'news', 1, false);
diff --git a/css/merged.scss b/css/merged.scss
new file mode 100644
index 000000000..17087081d
--- /dev/null
+++ b/css/merged.scss
@@ -0,0 +1 @@
+@import 'icons.scss';
\ No newline at end of file
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 179f539c2..3f510a7fc 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -31,8 +31,3 @@ export default {
 }
 </script>
 
-<style>
-.icon-rss {
-	background-image: url(/img/rss.svg) !important;
-}
-</style>
diff --git a/templates/index.php b/templates/index.php
index 5e760f644..2e0d9f5fb 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,5 +1,6 @@
 <?php
 script('news', 'nextcloud-news-main');
+style('news', 'merged');
 ?>
 
 <div id="q-app"></div>
diff --git a/webpack.js b/webpack.js
index 66cb7feef..c14623442 100644
--- a/webpack.js
+++ b/webpack.js
@@ -6,11 +6,12 @@ const config = {
     module: {
         rules: [
             {
-                test: /\.(jpg|png|svg)$/,
-                use: {
-                    loader: 'file-loader',
-                },
-            }
+				test: /\.(png|jpg|gif|svg)$/,
+				loader: 'file-loader',
+				options: {
+					name: '[name].[ext]?[hash]',
+				},
+			},
         ],
     },
 }
-- 
cgit v1.2.3