summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Treffler <mail@jonathan-treffler.de>2020-08-11 11:43:51 +0200
committerSimon Spannagel <simonspa@kth.se>2021-12-16 20:22:59 +0100
commite80c8480950ac31cde23b55c4c85b1c9ecb62209 (patch)
treecc58f414469bda3612a61940937c88616d6d98b4
parent5a3370ee07f3eb616ac9d678157124d838a6a284 (diff)
implemented scss icon loading
Signed-off-by: Jonathan Treffler <mail@jonathan-treffler.de>
-rw-r--r--css/icons.scss1
-rw-r--r--css/merged.scss1
-rw-r--r--src/components/Sidebar.vue5
-rw-r--r--templates/index.php1
-rw-r--r--webpack.js11
5 files changed, 9 insertions, 10 deletions
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]',
+ },
+ },
],
},
}