+
+
+ {{ circleData.title }}
+
+
+
+
+
+
Das lernst du in diesem Circle.
+
+ {{ circleData.description }}
+
+
+
+
+
+
+
Hast du Fragen?
+
Tausche dich mit der Fachexpertin aus für den Circle Analyse aus.
+
+
+
+
+
+
+
{{ learningSequence.title }}
+
+
{{ learningPackage.id }}
+
+
-
-
{{learningSequence.title}}
-
-
{{learningPackage.id}}
+
diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue
index 16c2d953..3cce25dd 100644
--- a/client/src/views/HomeView.vue
+++ b/client/src/views/HomeView.vue
@@ -3,6 +3,9 @@
- Hello from Home View
+ Hello from Home View
+
+
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
deleted file mode 100644
index bfe2b279..00000000
--- a/client/tailwind.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-module.exports = {
- content: [
- './index.html',
- './src/**/*.{vue,js,ts,jsx,tsx}',
- ],
- theme: {
- colors: {
- 'white': '#FFFFFF',
- 'blue-dark': '#00224D'
- },
- fontFamily: {
- sans: ['BuenosAires', 'sans-serif'],
- },
- extend: {},
- },
- plugins: [],
-}
diff --git a/package.json b/package.json
index 5e6a82aa..e648cbdd 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
"tailwind": "tailwindcss -i ./tailwind/input.css -o ./server/vbv_lernwelt/static/css/tailwind.css --watch"
},
"devDependencies": {
+ "@tailwindcss/forms": "^0.5.2",
+ "@tailwindcss/typography": "^0.5.2",
"cypress": "^9.4.1",
"tailwindcss": "^3.0.24"
}
diff --git a/client/src/assets/styles/fonts/BuenosAires-Regular.woff b/server/vbv_lernwelt/static/fonts/BuenosAires-Regular.woff
similarity index 100%
rename from client/src/assets/styles/fonts/BuenosAires-Regular.woff
rename to server/vbv_lernwelt/static/fonts/BuenosAires-Regular.woff
diff --git a/client/src/assets/styles/fonts/BuenosAires-Regular.woff2 b/server/vbv_lernwelt/static/fonts/BuenosAires-Regular.woff2
similarity index 100%
rename from client/src/assets/styles/fonts/BuenosAires-Regular.woff2
rename to server/vbv_lernwelt/static/fonts/BuenosAires-Regular.woff2
diff --git a/tailwind.config.js b/tailwind.config.js
index d1a6cdf4..d060cf08 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,18 +1,36 @@
+const colors = require('tailwindcss/colors')
+
module.exports = {
content: [
'./client/index.html',
'./client/src/**/*.{vue,js,ts,jsx,tsx}',
'./server/vbv_lernwelt/**/*.{html,js}',
-],
+ ],
theme: {
- colors: {
- 'white': '#FFFFFF',
- 'blue-dark': '#00224D'
- },
fontFamily: {
sans: ['BuenosAires', 'sans-serif'],
},
- extend: {},
+ extend: {
+ spacing: {
+ '128': '32rem',
+ }
+ },
+ colors: {
+ transparent: 'transparent',
+ current: 'currentColor',
+ black: colors.black,
+ white: colors.white,
+ blue: colors.blue,
+ gray: colors.gray,
+ emerald: colors.emerald,
+ indigo: colors.indigo,
+ yellow: colors.yellow,
+ slate: colors.slate,
+ 'blue-dark': '#00224D',
+ },
},
- plugins: [],
+ plugins: [
+ require('@tailwindcss/typography'),
+ require('@tailwindcss/forms'),
+ ],
}
diff --git a/tailwind/input.css b/tailwind/input.css
index 48373905..90dad3f1 100644
--- a/tailwind/input.css
+++ b/tailwind/input.css
@@ -2,16 +2,27 @@
@tailwind components;
@tailwind utilities;
+* {
+ @apply text-blue-dark;
+}
+
@layer base {
h1 {
- @apply text-4xl font-bold
+ @apply text-6xl font-bold
}
h2 {
- @apply text-2xl font-semibold
+ @apply text-4xl font-semibold
}
h3 {
- @apply text-lg font-medium italic
+ @apply text-2xl font-medium
}
}
+
+@layer components {
+ .circle-title {
+ @apply text-9xl font-bold
+ }
+}
+