Merge-Konflikte mit dev behoben

This commit is contained in:
Matthias Grief
2025-01-03 19:40:36 +01:00
parent 67f26d7574
commit ae54f896d6
2 changed files with 64 additions and 1 deletions

View File

@@ -219,4 +219,66 @@ body {
.content-text ol li {
list-style-type: decimal;
}
}
/* Einzelne Toast Styles */
.toast-content {
display: flex;
align-items: center;
border-radius: 12px; /* Abgerundete Ecken */
padding: 20px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
min-width: 200px;
max-width: 80%;
transition: opacity 0.5s ease, transform 0.5s ease;
opacity: 0;
transform: translateY(-20px);
}
/* Spezifische Klassen für verschiedene Toast-Typen */
.toast-success {
background-color: #38a169; /* Grüner Hintergrund */
}
.toast-error {
background-color: #e53e3e; /* Roter Hintergrund */
}
.toast-info {
background-color: #4299e1; /* Blauer Hintergrund */
}
/* Sichtbarkeit */
.toast-content.show {
opacity: 1;
transform: translateY(0);
}
/* Icon Styling */
.toast-icon {
font-size: 32px; /* Größeres Icon */
margin-right: 20px; /* Abstand zwischen Icon und Text */
color: white; /* Icons sollen immer weiß sein */
}
/* Nachrichten-Text Styling */
.toast-message {
color: white;
font-size: 18px; /* Größere Schriftgröße */
}
.task-container {
border-radius: 20px;
padding: 2rem;
margin-bottom: 2rem;
/*box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);*/
box-shadow: 2px 4px 6px 2px rgba(0, 0, 0, 0.1);
transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
}
.variable-input{
border: 2px solid;
border-radius: 8px;
text-align: center;
}

View File

@@ -35,6 +35,7 @@ if (!isset($topicData)) {
<script src="https://cdn.tailwindcss.com"></script>
<!--<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>-->
<script src="assets/js/sidebar.js"></script>
<script src="assets/js/tasks.js" defer></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.18/dist/katex.min.css"
integrity="sha384-veTAhWILPOotXm+kbR5uY7dRamYLJf58I7P+hJhjeuc7hsMAkJHTsPahAl0hBST0" crossorigin="anonymous">