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

Fix alignment of microphone in speakers list #4519

Merged
merged 4 commits into from
Feb 14, 2025
Merged

Fix alignment of microphone in speakers list #4519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8402c37
Fix alignment of microphone in speakers list
anbebe Jan 8, 2025
ccbaa07
Fix alignment of microphone in list of speakers
anbebe Jan 15, 2025
8cc6541
Merge remote-tracking branch 'upstream/main' into 4407_list_of_speakers
anbebe Feb 13, 2025
84c3c84
Merge branch 'main' into 4407_list_of_speakers
MSoeb Feb 14, 2025
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
30 changes: 21 additions & 9 deletions ...akers-content/components/list-of-speakers-content/list-of-speakers-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,27 @@

<!-- Current Speaker -->
@if (activeSpeaker) {
<div class="current-speaker background-accent">
<os-list-of-speakers-entry
[showcolor]="false"
[speaker]="activeSpeaker"
(pauseSpeech)="onPauseButton(activeSpeaker)"
(startSpeech)="onStartButton(activeSpeaker)"
(stopSpeech)="onStopButton(activeSpeaker)"
/>
</div>
@if (canManage) {
<div class="current-speaker desktop-speaker-indent background-accent">
<os-list-of-speakers-entry
[showcolor]="false"
[speaker]="activeSpeaker"
(pauseSpeech)="onPauseButton(activeSpeaker)"
(startSpeech)="onStartButton(activeSpeaker)"
(stopSpeech)="onStopButton(activeSpeaker)"
/>
</div>
} @else {
<div class="current-speaker background-accent">
<os-list-of-speakers-entry
[showcolor]="false"
[speaker]="activeSpeaker"
(pauseSpeech)="onPauseButton(activeSpeaker)"
(startSpeech)="onStartButton(activeSpeaker)"
(stopSpeech)="onStopButton(activeSpeaker)"
/>
</div>
}
}
@if (interposedQuestions.length) {
<div class="interposed-questions">
Expand Down
9 changes: 6 additions & 3 deletions ...akers-content/components/list-of-speakers-content/list-of-speakers-content.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@

padding: 0 0.75em;
border-radius: 4px;
@include desktop {
padding: 0 0.75em 0 calc(0.75em + 38px);
}
.speaker-start {
.mat-mdc-icon-button.speaker-control-button {
@include custom-size-button(46px, 42px);
Expand All @@ -78,6 +75,12 @@
}
}

.desktop-speaker-indent {
@include desktop {
padding: 0 0.75em 0 calc(0.75em + 38px);
}
}

.current-speaker:has(+ .interposed-questions) {
border-bottom-right-radius: 0;
margin-bottom: 0;
Expand Down
Loading