Sync dev with master

2024-01-21 14:19:59 +01:00
parent a6b3894077 a059aae772
commit 8510dee494
52 changed files with 306 additions and 294 deletions
--- a/static/admin/config/collections/widgets.js
+++ b/static/admin/config/collections/widgets.js
@ -41,7 +41,7 @@ const IconList = {
  label: "Symbol",
  widget: "string",
  required: false,
-  hint: "Liste unter https://assets.cantorgymnasium.de/fonts/mdi/v7/preview.html",
+  hint: "Liste unter https://assets.cantorgymnasium.de/fonts/mdi/v7/preview.html. Das `mdi` am Anfang ist wegzulassen.",
 };

 const PreviewNumber = {
--- a/static/admin/config/props.js
+++ b/static/admin/config/props.js
@ -9,6 +9,7 @@ const EditorProps = {

 const MarkdownProps = {
  widget: "markdown",
+  show_raw: true,
  toolbar_buttons: {
    main: [
      "bold",
--- a/static/admin/icons.js
+++ b/static/admin/icons.js
@ -17,6 +17,7 @@ const IconNames = {
  projektwoche: "mdi mdi-calendar-range-outline",
  superhaufen: "mdi mdi-view-dashboard",
  stats: "mdi mdi-chart-bar",
+  color: "mdi mdi-palette",
 };

 let Icons = [];
--- a/static/admin/index.html
+++ b/static/admin/index.html
@ -9,12 +9,12 @@
    />
    <link
      rel="stylesheet"
-      href="https://unpkg.com/@staticcms/app@next/dist/main.css"
+      href="https://unpkg.com/@staticcms/app@^4.0.0/dist/main.css"
    />
    <title>Static CMS</title>
  </head>
  <body>
-    <script src="https://unpkg.com/@staticcms/app@next/dist/static-cms-app.js"></script>
+    <script src="https://unpkg.com/@staticcms/app@^4.0.0/dist/static-cms-app.js"></script>
    <script type="module">
      import config from "./config/index.js";
      // imports
--- a/static/admin/previews/page-previews/event-preview.js
+++ b/static/admin/previews/page-previews/event-preview.js
@ -31,11 +31,11 @@ const EventPreview = ({ widgetsFor, entry }) => {
        ),
        h(
          "div",
-          { className: "filtr-container row" },
+          { className: "filter-container row" },
          widgetsFor("events").map((event) =>
            h(
              "div",
-              { className: "filtr-item col-12" },
+              { className: "filter-item col-12" },
              h(
                "div",
                {
--- a/static/admin/previews/page-previews/styles.js
+++ b/static/admin/previews/page-previews/styles.js
@ -1,7 +1,7 @@
 const PreviewStyles = [
  "https://assets.cantorgymnasium.de/bootstrap/v5/css/bootstrap.min.css",
-  "https://assets.cantorgymnasium.de/fonts/fira/fira.css",
-  "https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.css",
+  "https://assets.cantorgymnasium.de/fonts/fira/fira.min.css",
+  "https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.min.css",
  "https://assets.cantorgymnasium.de/fonts/mdi/v7/css/materialdesignicons.min.css",
  "/css/style.min.css",
 ];
--- a/static/media/blog/Sj2023_2024/vlw2023.jpg
+++ b/static/media/blog/Sj2023_2024/vlw2023.jpg
--- a/static/media/blog/Sj2023_2024/vlw2023.webp
+++ b/static/media/blog/Sj2023_2024/vlw2023.webp
--- a/static/media/gcgweihnachten.png
+++ b/static/media/gcgweihnachten.png