From 0c01d39fb3b7b72a121cf1783775e3ce2f778d73 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 13 Sep 2022 14:39:07 +0200 Subject: [PATCH 1/8] VBV-88: LearningPathView vertical --- client/index.html | 2 +- .../components/circle/LearningPathDiagram.vue | 34 ++++++++------- client/src/views/LearningPathView.vue | 10 +++-- client/src/views/LearningPathViewVertical.vue | 43 ++++++++----------- 4 files changed, 43 insertions(+), 46 deletions(-) diff --git a/client/index.html b/client/index.html index 75616849..d51b3bec 100644 --- a/client/index.html +++ b/client/index.html @@ -1,5 +1,5 @@ - + diff --git a/client/src/components/circle/LearningPathDiagram.vue b/client/src/components/circle/LearningPathDiagram.vue index aea2502a..d2beac47 100644 --- a/client/src/components/circle/LearningPathDiagram.vue +++ b/client/src/components/circle/LearningPathDiagram.vue @@ -1,18 +1,11 @@ - + From 20a3de4d80ef22cae312034073d363211258a215 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Wed, 14 Sep 2022 09:34:59 +0200 Subject: [PATCH 2/8] VBV-144: enable `hyphens: auto` on body tag --- client/src/components/circle/LearningPathDiagram.vue | 12 +++++++++--- client/src/views/CircleView.vue | 2 +- client/src/views/LearningPathView.vue | 4 ++-- client/src/views/LearningPathViewVertical.vue | 2 +- client/tailwind.css | 4 ++++ .../learnpath/create_default_learning_path.py | 4 ++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/client/src/components/circle/LearningPathDiagram.vue b/client/src/components/circle/LearningPathDiagram.vue index d2beac47..99ea8355 100644 --- a/client/src/components/circle/LearningPathDiagram.vue +++ b/client/src/components/circle/LearningPathDiagram.vue @@ -182,8 +182,14 @@ export default { const circlesText = circle_groups .append('text') .attr('fill', colors.blue[900]) - .style('font-size', 19) - .text((d) => d.title) + .style('font-size', 18) + .style('hyphens', 'auto') + .text((d) => { + if (!this.vertical) { + return d.title.replace('Prüfungsvorbereitung', 'Prüfungs- vorbereitung') + } + return d.title + }) const topicHeightOffset = 20 const topicHeight = 50 @@ -294,7 +300,7 @@ export default { topicTitles .attr('y', 20) - .style('font-size', 19) + .style('font-size', 18) .call(wrap, circleWidth * 0.8) .attr('class', 'topicTitles font-bold') } diff --git a/client/src/views/CircleView.vue b/client/src/views/CircleView.vue index 6881dfec..e2d17b3d 100644 --- a/client/src/views/CircleView.vue +++ b/client/src/views/CircleView.vue @@ -59,7 +59,7 @@ onMounted(async () => { zurück zum Lernpfad -

+

{{ circleStore.circle?.title }}

diff --git a/client/src/views/LearningPathView.vue b/client/src/views/LearningPathView.vue index 0f7621eb..1dd1319d 100644 --- a/client/src/views/LearningPathView.vue +++ b/client/src/views/LearningPathView.vue @@ -54,7 +54,7 @@ onMounted(async () => { > -

+

{{ learningPathStore.learningPath.title }}

@@ -66,7 +66,7 @@ onMounted(async () => {

- Nächster Schirtt + Nächster Schritt

{{ learningPathStore.learningPath.nextLearningContent.parentCircle.title }}: {{ learningPathStore.learningPath.nextLearningContent.parentLearningSequence.title }} diff --git a/client/src/views/LearningPathViewVertical.vue b/client/src/views/LearningPathViewVertical.vue index dc04b828..596857a6 100644 --- a/client/src/views/LearningPathViewVertical.vue +++ b/client/src/views/LearningPathViewVertical.vue @@ -21,7 +21,7 @@ const emits = defineEmits(['closemodal'])