diff --git a/anwendung/src/components/Button.jsx b/anwendung/src/components/Button.jsx
index d37acb8..81fd7a1 100644
--- a/anwendung/src/components/Button.jsx
+++ b/anwendung/src/components/Button.jsx
@@ -19,15 +19,17 @@ export default function Button(p) {
let onClick = p.onClick;
let color = p.color;
let fontColor = p.fontColor;
+ let font_size = p.fontSize;
//if parameters are not set, they are set to default values
- if (height == null) height = 50;
- if (width == null) width = 100;
+ if (height == null) height = 0;
+ if (width == null) width = 0;
if (iconWidth == null) iconWidth = width-10;
if (iconHeight == null) iconHeight = height-10;
if (onClick == null) onClick = () => {};
if (color == null) color = "#363636";
if (fontColor == null) fontColor = "white";
+ if (font_size == null) font_size = 16;
//build in the icon width and height to the svg tag (svg tag should not contain any size information by default)
if (iconHTML != null) {
@@ -48,7 +50,10 @@ export default function Button(p) {
alignItems: "center",
justifyContent: "center",
backgroundColor: color,
- color: fontColor
+ color: fontColor,
+ fontSize: font_size,
+ minWidth: width,
+ minHeight: height
}}
onClick={onClick}>
{text}
diff --git a/anwendung/src/components/CalenderView.jsx b/anwendung/src/components/CalenderView.jsx
index 91048af..8a502dd 100644
--- a/anwendung/src/components/CalenderView.jsx
+++ b/anwendung/src/components/CalenderView.jsx
@@ -1,5 +1,6 @@
import {useEffect, useState} from "react";
import {CalenderEntry} from "@/components/CalenderEntry";
+import Button from "@/components/Button";
let entries = {mo: [], tu: [], we: [], th: [], fr: [], sa: []}
let grabbed = null;
@@ -11,7 +12,7 @@ let selectedOffsetTop = 0;
let selectedOffsetBottom = 0;
let selectedListID = "";
-const cellHeight = 25;
+let cellHeight = 25;
export default function CalenderView(p) {
const [t, setT] = useState(false)
@@ -188,162 +189,202 @@ export default function CalenderView(p) {
}
return (
-
-
-
-
Montag
-
Dienstag
-
Mittwoch
-
Donnerstag
-
Freitag
-
Samstag
+
+
)
}
\ No newline at end of file
diff --git a/anwendung/src/styles/globals.css b/anwendung/src/styles/globals.css
index a578fa0..dc9e7de 100644
--- a/anwendung/src/styles/globals.css
+++ b/anwendung/src/styles/globals.css
@@ -255,7 +255,6 @@ Calender View
display: grid;
padding: 0 3px;
grid-template-columns: 100%;
- grid-template-rows: repeat(96, 25px);
}
.wochen-tag-container .wochen-tag