From d8f164432c0b18765f74473001c54006e50787a9 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sat, 25 Jan 2020 05:37:43 +0100 Subject: Clean up CSS and JavaScript files, change wiki layout a bit. Change-Id: Ib47bf59db5e4e65ef58515b45d63bd7f1572c88b --- .../resources/META-INF/resources/admin/admin.js | 2 -- .../resources/META-INF/resources/admin/index.html | 2 +- src/main/resources/META-INF/resources/common.css | 12 ++++++++++ .../resources/META-INF/resources/components.js | 2 ++ .../resources/templates/benki/wiki/wikiPage.html | 28 +++++++++++++++------- 5 files changed, 35 insertions(+), 11 deletions(-) delete mode 100644 src/main/resources/META-INF/resources/admin/admin.js create mode 100644 src/main/resources/META-INF/resources/common.css create mode 100644 src/main/resources/META-INF/resources/components.js diff --git a/src/main/resources/META-INF/resources/admin/admin.js b/src/main/resources/META-INF/resources/admin/admin.js deleted file mode 100644 index a4ba1cd..0000000 --- a/src/main/resources/META-INF/resources/admin/admin.js +++ /dev/null @@ -1,2 +0,0 @@ -import {AdminElement} from "./AdminElement.js"; - diff --git a/src/main/resources/META-INF/resources/admin/index.html b/src/main/resources/META-INF/resources/admin/index.html index f4db272..7e1aa0a 100644 --- a/src/main/resources/META-INF/resources/admin/index.html +++ b/src/main/resources/META-INF/resources/admin/index.html @@ -5,7 +5,7 @@ MulkCMS Admin - + diff --git a/src/main/resources/META-INF/resources/common.css b/src/main/resources/META-INF/resources/common.css new file mode 100644 index 0000000..4b07940 --- /dev/null +++ b/src/main/resources/META-INF/resources/common.css @@ -0,0 +1,12 @@ +/* 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"; + +/* 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/components.js new file mode 100644 index 0000000..61d4657 --- /dev/null +++ b/src/main/resources/META-INF/resources/components.js @@ -0,0 +1,2 @@ +import {AdminElement} from "./admin/AdminElement.js"; + diff --git a/src/main/resources/templates/benki/wiki/wikiPage.html b/src/main/resources/templates/benki/wiki/wikiPage.html index caf587a..28903ba 100644 --- a/src/main/resources/templates/benki/wiki/wikiPage.html +++ b/src/main/resources/templates/benki/wiki/wikiPage.html @@ -2,19 +2,31 @@ + {title} — Benki Wiki + + + -

{title}

+
+
+

{title}

-
- Last edit: {author.name} -
+
+ Last edit: by {author.name} +
+
-
-
+
{content.raw} -
-
+ + +
+ + +
-- cgit v1.2.3