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

Fix too big attachment text #3966

Closed
wants to merge 6 commits into from
Closed

Fix too big attachment text #3966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b03cb2b
Remove unused white areas on the sides
Aug 1, 2024
f97709c
Remove 'content-container' from Autopilot page
Aug 1, 2024
5a0faac
Apply linter
Aug 1, 2024
56a4217
Merge branch 'main' into 3846-los-improve-ui-on-small-screens
vkrasnovyd Aug 1, 2024
d8c23d3
Return white spaces for desktop and tablet
Aug 1, 2024
b2dd99b
Apply linter
Aug 1, 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
19 changes: 19 additions & 0 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 @@ -49,6 +49,11 @@

.current-speaker {
margin: 10px 25px 0 25px;

@include phone {
margin: 10px 0 0 0;
}

padding: 0 0.75em;
border-radius: 4px;
@include desktop {
Expand Down Expand Up @@ -81,6 +86,10 @@
.waiting-list,
.interposed-questions {
padding: 10px 25px 0 25px;

@include phone {
padding: 10px 0 0 0;
}
}

.interposed-questions {
Expand Down Expand Up @@ -126,6 +135,11 @@ os-sorting-list .line {

.add-self-buttons {
margin: 10px 20px;

@include phone {
padding: 10px 0;
}

display: inline-flex;
flex-wrap: wrap;

Expand All @@ -136,6 +150,11 @@ os-sorting-list .line {

.search-new-speaker-form {
padding: 15px 25px 0 25px;

@include phone {
padding: 15px 0 0 0;
}

width: auto;
}

Expand Down
11 changes: 10 additions & 1 deletion ...nts/pages/assignment-detail/components/assignment-detail/assignment-detail.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ mat-card mat-card-content h3 {
}

.candidates-list {
padding: 10px 25px 0 25px;
padding: 15px 25px 0 25px;

@include phone {
padding: 15px 0 0 0;
}

.single-candidate-line {
display: grid;
Expand Down Expand Up @@ -112,6 +116,11 @@ mat-card mat-card-content h3 {

.search-new-speaker-form {
padding: 15px 25px 0 25px;

@include phone {
padding: 15px 0 0 0;
}

width: auto;
}

Expand Down
261 changes: 126 additions & 135 deletions ...src/app/site/pages/meetings/pages/autopilot/components/autopilot/autopilot.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,163 +22,154 @@ <h2>{{ 'Autopilot' | translate }}</h2>
</button>
</ng-container>
</os-head-bar>
<div class="content-container">
<div class="col-wrapper">
<div class="col-main">
<!-- Title Card -->
@if (!!title && disabledContentElements['title'] !== true) {
<mat-card class="os-card">
<mat-card-content>
<a
[routerLink]="viewModelUrl || null"
[state]="{ back: 'true' }"
[target]="lowerProjectionTarget"
>
<h1>
{{ title | translate }}
</h1>

<div class="col-wrapper">
<div class="col-main">
<!-- Title Card -->
@if (!!title && disabledContentElements['title'] !== true) {
<mat-card class="os-card">
<mat-card-content>
<a [routerLink]="viewModelUrl || null" [state]="{ back: 'true' }" [target]="lowerProjectionTarget">
<h1>
{{ title | translate }}
</h1>
</a>
</mat-card-content>
</mat-card>
}

<!-- List of speakers -->
<os-list-of-speakers-content
*osPerms="
[permission.listOfSpeakersCanSee, permission.listOfSpeakersCanBeSpeaker];
and: !!listOfSpeakers && disabledContentElements['list-of-speakers'] !== true
"
[listOfSpeakers]="listOfSpeakers!"
(canReaddLastSpeakerEvent)="canReaddLastSpeaker = $event"
>
<ng-template osListOfSpeakersContentTitle>
<div class="line-and-icon subtitle-text">
@if (closUrl) {
<a [routerLink]="closUrl">
{{ 'List of speakers' | translate }}
</a>
</mat-card-content>
</mat-card>
}
}
@if (!closUrl) {
<span>
{{ 'List of speakers' | translate }}
</span>
}

<!-- List of speakers -->
<os-list-of-speakers-content
*osPerms="
[permission.listOfSpeakersCanSee, permission.listOfSpeakersCanBeSpeaker];
and: !!listOfSpeakers && disabledContentElements['list-of-speakers'] !== true
"
[listOfSpeakers]="listOfSpeakers!"
(canReaddLastSpeakerEvent)="canReaddLastSpeaker = $event"
>
<ng-template osListOfSpeakersContentTitle>
<div class="line-and-icon subtitle-text">
@if (closUrl) {
<a [routerLink]="closUrl">
{{ 'List of speakers' | translate }}
</a>
}
@if (!closUrl) {
<span>
{{ 'List of speakers' | translate }}
</span>
<ng-container *osPerms="permission.listOfSpeakersCanManage; complement: true">
@if (isLosClosed) {
<mat-icon
matTooltipPosition="above"
matTooltip="{{ 'The list of speakers is closed.' | translate }}"
>
lock
</mat-icon>
}
</ng-container>

<ng-container *osPerms="permission.listOfSpeakersCanManage; complement: true">
<ng-container *osPerms="permission.listOfSpeakersCanManage">
<button class="title-action" mat-icon-button (click)="toggleListOfSpeakersOpen()">
@if (isLosClosed) {
<mat-icon
matTooltipPosition="above"
matTooltip="{{ 'The list of speakers is closed.' | translate }}"
matTooltip="{{ 'Open list of speakers' | translate }}"
>
lock
</mat-icon>
}
</ng-container>

<ng-container *osPerms="permission.listOfSpeakersCanManage">
<button class="title-action" mat-icon-button (click)="toggleListOfSpeakersOpen()">
@if (isLosClosed) {
<mat-icon
matTooltipPosition="above"
matTooltip="{{ 'Open list of speakers' | translate }}"
>
lock
</mat-icon>
}
@if (!isLosClosed) {
<mat-icon
matTooltipPosition="above"
matTooltip="{{ 'Close list of speakers' | translate }}"
>
lock_open
</mat-icon>
}
</button>

<button
class="title-action"
mat-icon-button
matTooltipPosition="above"
[disabled]="!canReaddLastSpeaker"
matTooltip="{{ 'Re-add last speaker' | translate }}"
(click)="readdLastSpeaker()"
>
<mat-icon>undo</mat-icon>
</button>
</ng-container>
</div>
</ng-template>
</os-list-of-speakers-content>

<ng-container *osPerms="permission.listOfSpeakersCanSee">
@if (
structureLevelCountdownEnabled &&
listOfSpeakers &&
(showRightCol | async) === false &&
disabledContentElements['speaking-times'] !== true
) {
<div>
<ng-container [ngTemplateOutlet]="speakingTimes"></ng-container>
</div>
}
</ng-container>

<!-- Moderator Note-->
@if (hasCurrentProjection && disabledContentElements['moderation-note'] !== true) {
<div>
<os-moderation-note [listOfSpeakers]="listOfSpeakers"></os-moderation-note>
</div>
}

<!-- Poll-Collection -->
@if (
showPollCollection &&
(disabledContentElements['poll-finished'] !== true || disabledContentElements['poll-running'] !== true)
) {
<os-poll-collection
[currentProjection]="projectedViewModel"
[disableFinished]="disabledContentElements['poll-finished'] === true"
[disableRunning]="disabledContentElements['poll-running'] === true"
[displayInAutopilot]="true"
></os-poll-collection>
}
@if (!isLosClosed) {
<mat-icon
matTooltipPosition="above"
matTooltip="{{ 'Close list of speakers' | translate }}"
>
lock_open
</mat-icon>
}
</button>

<!-- Projector -->
@if (disabledContentElements['projector'] !== true) {
<mat-card class="os-card spacer-bottom-60">
<mat-card-content>
<a [routerLink]="projectorUrl" [state]="{ back: 'true' }" [target]="projectionTarget">
<p class="subtitle-text">{{ projectorTitle | translate }}</p>
</a>
<a
[routerLink]="viewModelUrl || null"
[state]="{ back: 'true' }"
[target]="lowerProjectionTarget"
<button
class="title-action"
mat-icon-button
matTooltipPosition="above"
[disabled]="!canReaddLastSpeaker"
matTooltip="{{ 'Re-add last speaker' | translate }}"
(click)="readdLastSpeaker()"
>
<div class="projector">
@if (projector) {
<os-projector [projector]="projector"></os-projector>
}
</div>
</a>
</mat-card-content>
</mat-card>
}
</div>
<mat-icon>undo</mat-icon>
</button>
</ng-container>
</div>
</ng-template>
</os-list-of-speakers-content>

<ng-container *osPerms="permission.listOfSpeakersCanSee">
@if (
disabledContentElements['speaking-times'] !== true &&
structureLevelCountdownEnabled &&
listOfSpeakers &&
showRightCol | async
structureLevelCountdownEnabled &&
listOfSpeakers &&
(showRightCol | async) === false &&
disabledContentElements['speaking-times'] !== true
) {
<div class="col-right">
<div>
<ng-container [ngTemplateOutlet]="speakingTimes"></ng-container>
</div>
}
</ng-container>

<!-- Moderator Note-->
@if (hasCurrentProjection && disabledContentElements['moderation-note'] !== true) {
<div>
<os-moderation-note [listOfSpeakers]="listOfSpeakers"></os-moderation-note>
</div>
}

<!-- Poll-Collection -->
@if (
showPollCollection &&
(disabledContentElements['poll-finished'] !== true || disabledContentElements['poll-running'] !== true)
) {
<os-poll-collection
[currentProjection]="projectedViewModel"
[disableFinished]="disabledContentElements['poll-finished'] === true"
[disableRunning]="disabledContentElements['poll-running'] === true"
[displayInAutopilot]="true"
></os-poll-collection>
}

<!-- Projector -->
@if (disabledContentElements['projector'] !== true) {
<mat-card class="os-card spacer-bottom-60">
<mat-card-content>
<a [routerLink]="projectorUrl" [state]="{ back: 'true' }" [target]="projectionTarget">
<p class="subtitle-text">{{ projectorTitle | translate }}</p>
</a>
<a [routerLink]="viewModelUrl || null" [state]="{ back: 'true' }" [target]="lowerProjectionTarget">
<div class="projector">
@if (projector) {
<os-projector [projector]="projector"></os-projector>
}
</div>
</a>
</mat-card-content>
</mat-card>
}
</div>

<ng-container *osPerms="permission.listOfSpeakersCanSee">
@if (
disabledContentElements['speaking-times'] !== true &&
structureLevelCountdownEnabled &&
listOfSpeakers &&
showRightCol | async
) {
<div class="col-right">
<ng-container [ngTemplateOutlet]="speakingTimes"></ng-container>
</div>
}
</ng-container>
</div>

<ng-template #speakingTimes>
Expand Down
7 changes: 3 additions & 4 deletions client/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,9 @@ button.mat-mdc-menu-item.selected {
font-size: 16px;
}

.queue {
.mat-expansion-panel-body {
padding: 0 !important;
}
.mat-expansion-panel-body {
padding: 0 !important;
margin-bottom: 16px;
}

.fake-button-no-touch {
Expand Down