diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.html b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.html index dccd02ad31..ed22f41f44 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.html +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.html @@ -5,7 +5,7 @@

{{ data.data.title }}

{{ 'Election' | translate }}

@if (data.data.description) { -
+
}

{{ 'Candidates' | translate }}

@if (data.data.candidates && data.data.candidates.length) { diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.scss b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.scss index e69de29bb2..7f6e150e3d 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.scss +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/assignment-slide/components/assignment-slide/assignment-slide.component.scss @@ -0,0 +1,5 @@ +@import 'src/assets/styles/mixins/detail-view-appearance.scss'; + +.detail-view-text ::ng-deep { + @include detail-view-appearance; +} diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html index 991e18071f..25d3d24f6f 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html @@ -83,7 +83,7 @@

@if (showText) { -
+
@if (isParagraphBasedAmendment() || formattedMotionTextPlain) { @@ -106,7 +106,10 @@

} @if (formattedMotionTextPlain) { -
+
}
} @@ -146,20 +149,28 @@

{{ paragraph.diffLineFrom }} - {{ paragraph.diffLineTo }}:

} -
+
} } @if (data.data.reason) { -
+

{{ 'Reason' | translate }}

-
+
}
- + + + + @if (data.data.reason) { +
+

{{ 'Reason' | translate }}

+
+
+ } } } diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss index 6794356a84..03c3bdc6df 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss @@ -1,9 +1,18 @@ @import 'src/app/site/pages/meetings/pages/motions/styles/motion-common-styles'; +@import 'src/assets/styles/mixins/detail-view-appearance.scss'; .paragraph-context { opacity: 0.5; } +.motion-text, +.motion-text-diff, +.reason-text { + .detail-view-text { + @include detail-view-appearance; + } +} + #sidebox { width: 260px; right: 0; diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.html b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.html index 3f06ddcebe..fcd717dc22 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.html +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.html @@ -6,6 +6,6 @@

} {{ data.data.title }}

-
+
} diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.scss b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.scss index e69de29bb2..7f6e150e3d 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.scss +++ b/client/src/app/site/pages/meetings/modules/projector/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.scss @@ -0,0 +1,5 @@ +@import 'src/assets/styles/mixins/detail-view-appearance.scss'; + +.detail-view-text ::ng-deep { + @include detail-view-appearance; +} diff --git a/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss b/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss index 5b29e64e27..895d31e39f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss +++ b/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss @@ -1,7 +1,9 @@ +@import 'src/assets/styles/mixins/detail-view-appearance.scss'; + .motion-text { ins, .insert { - color: green; + color: green !important; text-decoration: underline; a { color: green; @@ -10,7 +12,7 @@ del, .delete { - color: red; + color: red !important; text-decoration: line-through; a { color: red; @@ -131,4 +133,6 @@ &.amendment-context .paragraphcontext { opacity: 1; } + + @include detail-view-appearance; } diff --git a/client/src/assets/styles/mixins/detail-view-appearance.scss b/client/src/assets/styles/mixins/detail-view-appearance.scss index c1abdc0882..dfc67fdc97 100644 --- a/client/src/assets/styles/mixins/detail-view-appearance.scss +++ b/client/src/assets/styles/mixins/detail-view-appearance.scss @@ -2,6 +2,11 @@ @mixin detail-view-appearance { h1 { color: inherit; + font-weight: 400 !important; + } + + h2 { + font-weight: 700 !important; } h3 {