From 1bc8c5463ea14f8358c64ed1b5f6452597642bd0 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Wed, 22 May 2024 13:58:22 +0200 Subject: [PATCH 01/10] incluse detail-view-appearance --- .../assignment-slide/assignment-slide.component.html | 6 +++++- .../assignment-slide/assignment-slide.component.scss | 5 +++++ .../motion-slide/motion-slide.component.html | 12 ++++++++---- .../motion-slide/motion-slide.component.scss | 7 +++++++ .../topic-slide/topic-slide.component.html | 2 +- .../topic-slide/topic-slide.component.scss | 5 +++++ .../pages/motions/styles/motion-common-styles.scss | 8 ++++++-- 7 files changed, 37 insertions(+), 8 deletions(-) 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 4e9b039fc6..508c4ea41c 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 @@ -4,7 +4,11 @@

{{ data.data.title }}

{{ 'Election' | translate }}

-
+

{{ 'Candidates' | translate }}

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 936277f445..f0e1741528 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 @@ -93,7 +93,11 @@

{{ 'Changed title' | translate }}:
-
+
@@ -132,14 +136,14 @@

+
-
+

{{ '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 57f40e8dfd..cb7ba8b921 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,16 @@ @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 ccce389d43..4aafde14c9 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 @@ -4,5 +4,5 @@

{{ 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 1542e978df..33562672d2 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; @@ -130,4 +132,6 @@ &.amendment-context .paragraphcontext { opacity: 1; } + + @include detail-view-appearance; } From 79733fb42a277d9323cd0b1ff4f5dbd9b5df32a3 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Thu, 23 May 2024 07:27:00 +0200 Subject: [PATCH 02/10] cleanup --- .../components/motion-slide/motion-slide.component.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 cb7ba8b921..00d5df8f6a 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 @@ -5,11 +5,13 @@ opacity: 0.5; } -.motion-text, .motion-text-diff, .reason-text { +.motion-text, +.motion-text-diff, +.reason-text { .detail-view-text { @include detail-view-appearance; } -} +} #sidebox { width: 260px; From a3671ee0c5b91789e161f79c6367d5a211c526e9 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Fri, 12 Jul 2024 13:41:41 +0200 Subject: [PATCH 03/10] merge conclicts --- .../assignment-slide/assignment-slide.component.html | 2 +- .../motion-slide/motion-slide.component.html | 11 +++++++---- .../components/topic-slide/topic-slide.component.html | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) 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 82163b8a52..8dffc3dfe2 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/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 fa81f7db7f..44f8f53b5a 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 @@ -106,7 +106,10 @@

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

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

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

{{ 'Reason' | translate }}

-
+
}
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 }}

-
+
} From d2cb983391bd3b05b8360cdd2182335b2ba0f946 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Fri, 12 Jul 2024 13:43:15 +0200 Subject: [PATCH 04/10] Remove remnants --- .../assignment-slide/assignment-slide.component.html | 4 ---- 1 file changed, 4 deletions(-) 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 8dffc3dfe2..d5395156bb 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 @@ -29,7 +29,6 @@

{{ 'Candidates' | translate }}

} } -<<<<<<< HEAD
{{ 'Candidates' | translate }}
-======= -} ->>>>>>> upstream/main From b927770b5fe1a7c78792788cdee08ea0143b4636 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Fri, 12 Jul 2024 13:44:25 +0200 Subject: [PATCH 05/10] Remove remnants --- .../assignment-slide.component.html | 21 ------------------- 1 file changed, 21 deletions(-) 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 d5395156bb..520a61e30c 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 @@ -29,24 +29,3 @@

{{ 'Candidates' | translate }}

} } - -
- -

{{ 'Candidates' | translate }}

- -
    -
  1. - {{ candidate }} -
  2. -
-
    -
  • - {{ candidate }} -
  • -
-
- From 97c39a8f5441b9d2f20a5306e6fe1fd8e89a5302 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Fri, 12 Jul 2024 14:02:29 +0200 Subject: [PATCH 06/10] Compile Errors --- .../assignment-slide/assignment-slide.component.html | 1 + .../components/motion-slide/motion-slide.component.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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 520a61e30c..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 @@ -29,3 +29,4 @@

{{ 'Candidates' | 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.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 44f8f53b5a..7b0d7e468a 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) { @@ -167,7 +167,7 @@

{{ 'Reason' | translate }}

{{ 'Reason' | translate }}

-
+
}
From 7803909eea2b047f7879e46c0693b9b92ceec992 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Tue, 23 Jul 2024 16:46:03 +0200 Subject: [PATCH 07/10] define h1 with normal/400 --- client/src/assets/styles/mixins/detail-view-appearance.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/assets/styles/mixins/detail-view-appearance.scss b/client/src/assets/styles/mixins/detail-view-appearance.scss index c1abdc0882..1a80a77e18 100644 --- a/client/src/assets/styles/mixins/detail-view-appearance.scss +++ b/client/src/assets/styles/mixins/detail-view-appearance.scss @@ -2,6 +2,7 @@ @mixin detail-view-appearance { h1 { color: inherit; + font-weight: 400 !important; } h3 { From 4947755cb8f055014343fc8201d6cdc88b62b167 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Mon, 12 Aug 2024 16:43:55 +0200 Subject: [PATCH 08/10] update h2 --- client/src/assets/styles/mixins/detail-view-appearance.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/assets/styles/mixins/detail-view-appearance.scss b/client/src/assets/styles/mixins/detail-view-appearance.scss index 1a80a77e18..49992c923a 100644 --- a/client/src/assets/styles/mixins/detail-view-appearance.scss +++ b/client/src/assets/styles/mixins/detail-view-appearance.scss @@ -5,6 +5,10 @@ font-weight: 400 !important; } + h2 { + font-weight: 700; + } + h3 { font-weight: 600; } From c462afb4a02468db0f495cb573cec3dd74b8d078 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Mon, 12 Aug 2024 16:48:11 +0200 Subject: [PATCH 09/10] clean up --- .../motion-slide/motion-slide.component.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 7b0d7e468a..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 @@ -165,10 +165,12 @@

{{ 'Reason' | translate }}

-
-

{{ 'Reason' | translate }}

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

{{ 'Reason' | translate }}

+
+
+ } }
} From bd57010aa3d757c9735114f2a8c34316846ecf79 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Tue, 13 Aug 2024 08:23:38 +0200 Subject: [PATCH 10/10] overwrite projexctor font-weight --- client/src/assets/styles/mixins/detail-view-appearance.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/assets/styles/mixins/detail-view-appearance.scss b/client/src/assets/styles/mixins/detail-view-appearance.scss index 49992c923a..dfc67fdc97 100644 --- a/client/src/assets/styles/mixins/detail-view-appearance.scss +++ b/client/src/assets/styles/mixins/detail-view-appearance.scss @@ -6,7 +6,7 @@ } h2 { - font-weight: 700; + font-weight: 700 !important; } h3 {