Merge branch 'develop' into feature/cockpit-ui
# Conflicts: # client/src/components/competences/CompetenceDetail.vue # client/src/locales/de.json # client/tailwind.config.js
This commit is contained in:
commit
c5d4d678ea
|
|
@ -1,6 +1,7 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import PerformanceCriteriaRow from "@/components/competences/PerformanceCriteriaRow.vue";
|
import PerformanceCriteriaRow from "@/components/competences/PerformanceCriteriaRow.vue";
|
||||||
import ItProgress from "@/components/ui/ItProgress.vue";
|
import ItProgress from "@/components/ui/ItProgress.vue";
|
||||||
|
import ItToggleArrow from "@/components/ui/ItToggleArrow.vue";
|
||||||
import { useCompetenceStore } from "@/stores/competence";
|
import { useCompetenceStore } from "@/stores/competence";
|
||||||
import type { CompetencePage } from "@/types";
|
import type { CompetencePage } from "@/types";
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
<script setup lang="ts">
|
||||||
|
interface Props {
|
||||||
|
isOpen: boolean;
|
||||||
|
small?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
|
isOpen: false,
|
||||||
|
small: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
function sizeClasses() {
|
||||||
|
return props.small ? ["h-8", "w-8"] : ["h-10", "w-10"];
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="transition-transform" :class="{ 'rotate-180': isOpen }">
|
||||||
|
<it-icon-arrow-down :class="sizeClasses()" aria-hidden="true" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<style lang="scss" scoped></style>
|
||||||
|
|
@ -14,7 +14,9 @@
|
||||||
"circles": "Circles",
|
"circles": "Circles",
|
||||||
"transferTask": "Transferauftrag | Transferaufträge",
|
"transferTask": "Transferauftrag | Transferaufträge",
|
||||||
"feedback": "Feedback | Feedbacks",
|
"feedback": "Feedback | Feedbacks",
|
||||||
"examResult": "Prüfungsresultat | Prüfungsresultate"
|
"exam": "Prüfung | Prüfungen",
|
||||||
|
"examResult": "Prüfungsresultat | Prüfungsresultate",
|
||||||
|
"certificate": "Zertifikat | Zertifikate"
|
||||||
},
|
},
|
||||||
"mainNavigation": {
|
"mainNavigation": {
|
||||||
"logout": "Abmelden",
|
"logout": "Abmelden",
|
||||||
|
|
@ -49,6 +51,7 @@
|
||||||
"progressLink": "KompetenzNavi öffnen"
|
"progressLink": "KompetenzNavi öffnen"
|
||||||
},
|
},
|
||||||
"competences": {
|
"competences": {
|
||||||
|
"competences": "Kompetenzen",
|
||||||
"title": "KompetenzNavi",
|
"title": "KompetenzNavi",
|
||||||
"lastImprovements": "Letzte verbesserte Kompetenzen",
|
"lastImprovements": "Letzte verbesserte Kompetenzen",
|
||||||
"showAll": "Alle anschauen",
|
"showAll": "Alle anschauen",
|
||||||
|
|
@ -79,5 +82,8 @@
|
||||||
"examsDone": "Abgelegte Prüfungen von Teilnehmer.",
|
"examsDone": "Abgelegte Prüfungen von Teilnehmer.",
|
||||||
"progress": "Fortschritt",
|
"progress": "Fortschritt",
|
||||||
"profileLink": "Profil anzeigen"
|
"profileLink": "Profil anzeigen"
|
||||||
|
},
|
||||||
|
"messages": {
|
||||||
|
"sendMessage": "Nachricht schreiben"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -32,6 +32,7 @@ module.exports = {
|
||||||
assignment: "url('/static/icons/icon-lc-assignment.svg')",
|
assignment: "url('/static/icons/icon-lc-assignment.svg')",
|
||||||
feedback: "url('/static/icons/icon-feedback.svg')",
|
feedback: "url('/static/icons/icon-feedback.svg')",
|
||||||
test: "url('/static/icons/icon-lc-test.svg')",
|
test: "url('/static/icons/icon-lc-test.svg')",
|
||||||
|
message: "url('/static/icons/icon-message.svg')",
|
||||||
},
|
},
|
||||||
borderColor: (theme) => ({
|
borderColor: (theme) => ({
|
||||||
DEFAULT: theme("colors.gray.500"),
|
DEFAULT: theme("colors.gray.500"),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue