From 86d48f5456a34abb8770bb1799efd19b0878fb06 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Wed, 1 May 2024 16:31:39 +0200
Subject: [PATCH] Change font for solutions

Relates to MS-938
---
 .../components/content-blocks/CmsDocumentBlock.vue   | 12 +-----------
 client/src/components/content-blocks/Solution.vue    |  3 +++
 .../content-blocks/assignment/Assignment.vue         |  1 +
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/src/components/content-blocks/CmsDocumentBlock.vue b/client/src/components/content-blocks/CmsDocumentBlock.vue
index d19ebe5b..76aa78ec 100644
--- a/client/src/components/content-blocks/CmsDocumentBlock.vue
+++ b/client/src/components/content-blocks/CmsDocumentBlock.vue
@@ -16,9 +16,7 @@
 <script>
 import { defineAsyncComponent } from 'vue';
 
-const DocumentIcon = defineAsyncComponent(() =>
-  import('@/components/icons/DocumentIcon.vue')
-);
+const DocumentIcon = defineAsyncComponent(() => import('@/components/icons/DocumentIcon.vue'));
 
 export default {
   props: {
@@ -57,14 +55,6 @@ export default {
 
   &--solution {
     margin-bottom: $small-spacing;
-
-    #{$parent}__link {
-      color: $color-silver-dark;
-    }
-
-    #{$parent}__icon {
-      fill: $color-silver-dark;
-    }
   }
 }
 </style>
diff --git a/client/src/components/content-blocks/Solution.vue b/client/src/components/content-blocks/Solution.vue
index 8db330e4..58460f47 100644
--- a/client/src/components/content-blocks/Solution.vue
+++ b/client/src/components/content-blocks/Solution.vue
@@ -82,8 +82,10 @@ export default {
 
   &__text {
     font-size: toRem(18px);
+    @include regular-text;
 
     :deep(p) {
+      @include regular-text;
       font-size: toRem(18px);
     }
 
@@ -91,6 +93,7 @@ export default {
       padding-left: $medium-spacing;
 
       > li {
+        @include regular-text;
         list-style: disc outside none;
       }
     }
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index f6ca2e02..f68a3dac 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -427,6 +427,7 @@ const spellcheck = () => {
   }
 
   &__main-text {
+    margin-bottom: $medium-spacing;
     :deep(ul) {
       @include list-parent;
     }