Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust projected motion/topic/election to new detail view #3693

Merged
merged 15 commits into from
Aug 22, 2024
Merged

Adjust projected motion/topic/election to new detail view #3693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1bc8c54
incluse detail-view-appearance
Elblinator May 22, 2024
79733fb
cleanup
Elblinator May 23, 2024
bcd46f0
Merge remote-tracking branch 'upstream/main' into 2729-call-detail_scss
Elblinator Jun 3, 2024
a326ed8
Merge remote-tracking branch 'upstream/main' into 2729-call-detail_scss
Elblinator Jul 1, 2024
0408f5b
Merge remote-tracking branch 'upstream/main' into 2729-call-detail_scss
Elblinator Jul 12, 2024
a3671ee
merge conclicts
Elblinator Jul 12, 2024
d2cb983
Remove remnants
Elblinator Jul 12, 2024
b927770
Remove remnants
Elblinator Jul 12, 2024
97c39a8
Compile Errors
Elblinator Jul 12, 2024
0b8bb3a
Merge remote-tracking branch 'upstream/main' into 2729-call-detail_scss
Elblinator Jul 23, 2024
7803909
define h1 with normal/400
Elblinator Jul 23, 2024
d22d87e
Merge remote-tracking branch 'upstream/main' into 2729-call-detail_scss
Elblinator Aug 12, 2024
4947755
update h2
Elblinator Aug 12, 2024
c462afb
clean up
Elblinator Aug 12, 2024
bd57010
overwrite projexctor font-weight
Elblinator Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/components/assignment-slide/components/assignment-slide/assignment-slide.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1>{{ data.data.title }}</h1>
<h2>{{ 'Election' | translate }}</h2>
</div>
@if (data.data.description) {
<div [innerHTML]="data.data.description | trust: 'html'"></div>
<div class="detail-view-text" [innerHTML]="data.data.description | trust: 'html'"></div>
}
<h3>{{ 'Candidates' | translate }}</h3>
@if (data.data.candidates && data.data.candidates.length) {
Expand Down
5 changes: 5 additions & 0 deletions ...s/components/assignment-slide/components/assignment-slide/assignment-slide.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import 'src/assets/styles/mixins/detail-view-appearance.scss';

.detail-view-text ::ng-deep {
@include detail-view-appearance;
}
23 changes: 17 additions & 6 deletions ...mponents/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ <h2 class="projector_h2">
</div>
</div>
@if (showText) {
<div id="text-wrapper">
<section id="text-wrapper">
<div id="text" [ngStyle]="textDivStyles">
<!-- Text -->
@if (isParagraphBasedAmendment() || formattedMotionTextPlain) {
Expand All @@ -106,7 +106,10 @@ <h2 class="projector_h2">
</div>
}
@if (formattedMotionTextPlain) {
<div [innerHTML]="formattedMotionTextPlain | trust: 'html'"></div>
<div
class="detail-view-text"
[innerHTML]="formattedMotionTextPlain | trust: 'html'"
></div>
}
</div>
}
Expand Down Expand Up @@ -146,20 +149,28 @@ <h3 class="amendment-line-header">
{{ paragraph.diffLineFrom }} - {{ paragraph.diffLineTo }}:
</h3>
}
<div [innerHtml]="paragraph.text | trust: 'html'"></div>
<div class="detail-view-text" [innerHtml]="paragraph.text | trust: 'html'"></div>
</div>
}
</section>
}
<!-- Reason -->
@if (data.data.reason) {
<div>
<div class="reason-text">
<h3>{{ 'Reason' | translate }}</h3>
<div [innerHTML]="data.data.reason | trust: 'html'"></div>
<div class="detail-view-text" [innerHTML]="data.data.reason | trust: 'html'"></div>
</div>
}
</div>
</div>
</section>

<!-- Reason -->
@if (data.data.reason) {
<div>
<h3>{{ 'Reason' | translate }}</h3>
<div [innerHTML]="data.data.reason | trust: 'html'"></div>
</div>
}
}
</div>
}
9 changes: 9 additions & 0 deletions ...mponents/motions/modules/motion-slide/components/motion-slide/motion-slide.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ <h1 class="projector_h1">
}
{{ data.data.title }}
</h1>
<div [innerHTML]="data.data.text | trust: 'html'"></div>
<div class="detail-view-text" [innerHTML]="data.data.text | trust: 'html'"></div>
</div>
}
5 changes: 5 additions & 0 deletions ...r/modules/slides/components/topic-slide/components/topic-slide/topic-slide.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import 'src/assets/styles/mixins/detail-view-appearance.scss';

.detail-view-text ::ng-deep {
@include detail-view-appearance;
}
8 changes: 6 additions & 2 deletions client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -10,7 +12,7 @@

del,
.delete {
color: red;
color: red !important;
text-decoration: line-through;
a {
color: red;
Expand Down Expand Up @@ -131,4 +133,6 @@
&.amendment-context .paragraphcontext {
opacity: 1;
}

@include detail-view-appearance;
}
5 changes: 5 additions & 0 deletions client/src/assets/styles/mixins/detail-view-appearance.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
@mixin detail-view-appearance {
h1 {
color: inherit;
font-weight: 400 !important;
}

h2 {
font-weight: 700 !important;
}

h3 {
Expand Down