summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2020-01-31 19:28:31 +0100
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2020-01-31 19:28:31 +0100
commit1f79d1db101b706649aed93ed36092477db7d357 (patch)
tree714d11f8cd35f8e54368bc5f06627de989a8e3bb /src/main
parent8b35def5c2ef844e1c093374792393bb65e51e33 (diff)
Move web files below /cms2 so they are easier to serve.
Change-Id: Ib56ceaef4ecaaa5c12398d6e27c63404eb4b9cd6
Diffstat (limited to 'src/main')
-rw-r--r--src/main/resources/META-INF/resources/base.css15
-rw-r--r--src/main/resources/META-INF/resources/cms2/admin/AdminElement.js (renamed from src/main/resources/META-INF/resources/admin/AdminElement.js)4
-rw-r--r--src/main/resources/META-INF/resources/cms2/admin/index.html (renamed from src/main/resources/META-INF/resources/admin/index.html)2
-rw-r--r--src/main/resources/META-INF/resources/cms2/base.css15
-rw-r--r--src/main/resources/META-INF/resources/cms2/components.js (renamed from src/main/resources/META-INF/resources/components.js)0
-rw-r--r--src/main/resources/templates/base.html4
6 files changed, 20 insertions, 20 deletions
diff --git a/src/main/resources/META-INF/resources/base.css b/src/main/resources/META-INF/resources/base.css
deleted file mode 100644
index 1f1a941..0000000
--- a/src/main/resources/META-INF/resources/base.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Pure CSS */
-@import "web_modules/purecss/build/base.css";
-@import "web_modules/purecss/build/buttons.css";
-@import "web_modules/purecss/build/forms.css";
-@import "web_modules/purecss/build/menus.css";
-@import "web_modules/purecss/build/tables.css";
-
-/* Normalize + OpenType */
-@import "web_modules/normalize-opentype.css/normalize-opentype.css";
-
-/* Sanitize.css */
-@import "web_modules/sanitize.css/sanitize.css";
-@import "web_modules/sanitize.css/forms.css";
-@import "web_modules/sanitize.css/page.css";
-@import "web_modules/sanitize.css/typography.css";
diff --git a/src/main/resources/META-INF/resources/admin/AdminElement.js b/src/main/resources/META-INF/resources/cms2/admin/AdminElement.js
index 1fdfbe7..36db08d 100644
--- a/src/main/resources/META-INF/resources/admin/AdminElement.js
+++ b/src/main/resources/META-INF/resources/cms2/admin/AdminElement.js
@@ -1,5 +1,5 @@
-import {html, render} from "../web_modules/lit-html.js";
-import {createStore} from "../web_modules/redux.js";
+import {html, render} from "../../web_modules/lit-html.js";
+import {createStore} from "../../web_modules/redux.js";
export class AdminElement extends HTMLElement {
constructor() {
diff --git a/src/main/resources/META-INF/resources/admin/index.html b/src/main/resources/META-INF/resources/cms2/admin/index.html
index 7e1aa0a..9e49564 100644
--- a/src/main/resources/META-INF/resources/admin/index.html
+++ b/src/main/resources/META-INF/resources/cms2/admin/index.html
@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<title>MulkCMS Admin</title>
- <script type="module" src="/components.js"></script>
+ <script type="module" src="/cms2/components.js"></script>
</head>
<body>
diff --git a/src/main/resources/META-INF/resources/cms2/base.css b/src/main/resources/META-INF/resources/cms2/base.css
new file mode 100644
index 0000000..e525a23
--- /dev/null
+++ b/src/main/resources/META-INF/resources/cms2/base.css
@@ -0,0 +1,15 @@
+/* Pure CSS */
+@import "../web_modules/purecss/build/base.css";
+@import "../web_modules/purecss/build/buttons.css";
+@import "../web_modules/purecss/build/forms.css";
+@import "../web_modules/purecss/build/menus.css";
+@import "../web_modules/purecss/build/tables.css";
+
+/* Normalize + OpenType */
+@import "../web_modules/normalize-opentype.css/normalize-opentype.css";
+
+/* Sanitize.css */
+@import "../web_modules/sanitize.css/sanitize.css";
+@import "../web_modules/sanitize.css/forms.css";
+@import "../web_modules/sanitize.css/page.css";
+@import "../web_modules/sanitize.css/typography.css";
diff --git a/src/main/resources/META-INF/resources/components.js b/src/main/resources/META-INF/resources/cms2/components.js
index 61d4657..61d4657 100644
--- a/src/main/resources/META-INF/resources/components.js
+++ b/src/main/resources/META-INF/resources/cms2/components.js
diff --git a/src/main/resources/templates/base.html b/src/main/resources/templates/base.html
index 4c45403..6b1ad42 100644
--- a/src/main/resources/templates/base.html
+++ b/src/main/resources/templates/base.html
@@ -5,9 +5,9 @@
<title>{#insert title}{/}</title>
- <link rel="stylesheet" type="text/css" href="/base.css" />
+ <link rel="stylesheet" type="text/css" href="/cms2/base.css" />
<script type="importmap" src="/web_modules/import-map.json"></script>
- <script type="module" src="/components.js"></script>
+ <script type="module" src="/cms2/components.js"></script>
{#insert head}{/}
</head>