diff --git a/layouts/base.htm b/layouts/base.htm index eeeeae4..9980bdd 100644 --- a/layouts/base.htm +++ b/layouts/base.htm @@ -3,7 +3,7 @@ {% partial 'shared/head' %} - + {% partial 'shared/header' %} {% page %} {% partial 'shared/footer' %} diff --git a/pages/homepage.htm b/pages/homepage.htm index cd29f72..bd71c82 100644 --- a/pages/homepage.htm +++ b/pages/homepage.htm @@ -7,16 +7,16 @@ is_hidden = 0 ==
- +
-
- Ablauf - Buchungsanfrage - FAQ +
+ Ablauf + Buchungsanfrage + FAQ
-
+
{% partial 'heading' title="Ablauf" %}
{% partial 'listelement' title="Anfragen" number="1" content='Fülle das folgende Formular aus und sende uns so eine Buchungsanfrage.' %} @@ -28,7 +28,7 @@ is_hidden = 0
-
+
{% partial 'heading' title="Anfrage" %} {% component 'anfrage' %}
diff --git a/partials/listelement.htm b/partials/listelement.htm index d19c0c6..a12f160 100644 --- a/partials/listelement.htm +++ b/partials/listelement.htm @@ -1,5 +1,5 @@
-
+
{{number}}
{{title}}
diff --git a/resources/css/app.css b/resources/css/app.css index ef46369..f98e355 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,8 +1,10 @@ -@import '_tailwind-base.css'; +@import "_tailwind-base.css"; /*@import "_custom-base-styles.css";*/ -@import '_tailwind-components.css'; +@import "_tailwind-components.css"; /*@import '_custom-components.css';*/ -@import '_tailwind-utilities.css'; +@import "_tailwind-utilities.css"; /*@import "_custom-utilities.css";*/ + +@import "./fonts.css"; diff --git a/resources/css/fonts.css b/resources/css/fonts.css new file mode 100644 index 0000000..8c2c3f2 --- /dev/null +++ b/resources/css/fonts.css @@ -0,0 +1,48 @@ +/* nunito-regular - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 400; + src: url("../fonts/nunito-v26-latin-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* nunito-500 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 500; + src: url("../fonts/nunito-v26-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* nunito-600 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 600; + src: url("../fonts/nunito-v26-latin-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* nunito-700 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 700; + src: url("../fonts/nunito-v26-latin-700.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* nunito-800 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 800; + src: url("../fonts/nunito-v26-latin-800.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* nunito-900 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Nunito"; + font-style: normal; + font-weight: 900; + src: url("../fonts/nunito-v26-latin-900.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} diff --git a/resources/fonts/nunito-v26-latin-500.woff2 b/resources/fonts/nunito-v26-latin-500.woff2 new file mode 100644 index 0000000..7331d3c Binary files /dev/null and b/resources/fonts/nunito-v26-latin-500.woff2 differ diff --git a/resources/fonts/nunito-v26-latin-600.woff2 b/resources/fonts/nunito-v26-latin-600.woff2 new file mode 100644 index 0000000..7c47892 Binary files /dev/null and b/resources/fonts/nunito-v26-latin-600.woff2 differ diff --git a/resources/fonts/nunito-v26-latin-700.woff2 b/resources/fonts/nunito-v26-latin-700.woff2 new file mode 100644 index 0000000..57c5a6c Binary files /dev/null and b/resources/fonts/nunito-v26-latin-700.woff2 differ diff --git a/resources/fonts/nunito-v26-latin-800.woff2 b/resources/fonts/nunito-v26-latin-800.woff2 new file mode 100644 index 0000000..3e93dfc Binary files /dev/null and b/resources/fonts/nunito-v26-latin-800.woff2 differ diff --git a/resources/fonts/nunito-v26-latin-900.woff2 b/resources/fonts/nunito-v26-latin-900.woff2 new file mode 100644 index 0000000..7d4aa2c Binary files /dev/null and b/resources/fonts/nunito-v26-latin-900.woff2 differ diff --git a/resources/fonts/nunito-v26-latin-regular.woff2 b/resources/fonts/nunito-v26-latin-regular.woff2 new file mode 100644 index 0000000..99439c1 Binary files /dev/null and b/resources/fonts/nunito-v26-latin-regular.woff2 differ diff --git a/tailwind.config.js b/tailwind.config.js index 110c28f..61230b3 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,7 +1,11 @@ module.exports = { content: ["./**/*.htm", "./node_modules/flowbite/**/*.js"], theme: { - extend: {}, + extend: { + fontFamily: { + nunito: ["Nunito", "sans-serif"], + }, + }, }, plugins: [require("@tailwindcss/forms"), require("flowbite/plugin")], }; diff --git a/vite.config.js b/vite.config.js index ef27a4f..269657e 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,33 +1,30 @@ -const Dotenv = require('dotenv') -import liveReload from 'vite-plugin-live-reload' +const Dotenv = require("dotenv"); +import liveReload from "vite-plugin-live-reload"; Dotenv.config(); -const ASSET_URL = process.env.ASSET_URL || 'http://localhost:3000'; -const VITE_INPUT = process.env.VITE_INPUT || 'resources/js/app.js'; +const ASSET_URL = process.env.ASSET_URL || "http://localhost:3000"; +const VITE_INPUT = process.env.VITE_INPUT || "resources/js/app.js"; -export default ({command}) => { - - return { - base: command === 'serve' ? '' : '/build/', - /*base: `${ASSET_URL}`,*/ - publicDir: 'fake_dir_so_nothing_gets_copied', - build: { - manifest: true, - outDir: 'build', - rollupOptions: { - input: `${VITE_INPUT}` - }, - }, - server: { - strictPort: true, - port: 3000, - }, - resolve: { - extensions: ['.js','.mjs'] - }, - plugins: [ - liveReload('./**/*.htm'), - ] - } +export default ({ command }) => { + return { + base: command === "serve" ? "/themes/vite-tailwind" : "/build/", + /*base: `${ASSET_URL}`,*/ + publicDir: "fake_dir_so_nothing_gets_copied", + build: { + manifest: true, + outDir: "build", + rollupOptions: { + input: `${VITE_INPUT}`, + }, + }, + server: { + strictPort: true, + port: 3000, + }, + resolve: { + extensions: [".js", ".mjs"], + }, + plugins: [liveReload("./**/*.htm")], + }; };