ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4167 from MaximilianKrambach/shortenTitle

Browse Source 
shortening motion titles
This commit is contained in:
Sean 2019-01-22 11:37:37 +01:00 committed by GitHub
commit aa668b72d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/src/app/site/motions/components/motion-list/motion-list.component.html
View File

@ -50,24 +50,28 @@
<ng-container matColumnDef="title"> <ng-container matColumnDef="title">
<mat-header-cell *matHeaderCellDef mat-sort-header>Title</mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Title</mat-header-cell>
<mat-cell *matCellDef="let motion"> <mat-cell *matCellDef="let motion">
<div class="innerTable"> <div class="innerTable max-width">
<span class="motion-list-title">{{ motion.title }} <!-- title line -->
<span> <div class="motion-list">
<mat-icon inline>{{ motion.star ? 'star' : 'star_border' }}</mat-icon> <!-- attachment icon -->
<span class="attached-files" *ngIf="motion.hasAttachments()">
<mat-icon>attach_file</mat-icon>
</span> </span>
</span> <!-- title -->
<span class="motion-list-title" matTooltip="{{ motion.title }}">
<!-- attachments --> {{ motion.title }}
<span class="attached-files" *ngIf="motion.hasAttachments()"> </span>
<!-- <mat-basic-chip class="bluegrey"> <mat-icon>attach_file</mat-icon> </mat-basic-chip> --> <!-- favorite icon -->
<mat-icon>attach_file</mat-icon> <span *ngIf="motion.star" class="favorite-star">
</span> <mat-icon inline>star</mat-icon>
</span>
<br /> </div>
<span class="motion-list-from" *ngIf="motion.submitters.length"> <!-- submitters line -->
<span translate>by</span> {{ motion.submitters }} <div class="motion-list">
</span> <span class="motion-list-from" *ngIf="motion.submitters.length">
<br *ngIf="motion.submitters.length" /> <span translate>by</span> {{ motion.submitters }}
</span>
</div>
<!-- state --> <!-- state -->
<mat-basic-chip <mat-basic-chip
*ngIf="motion.state" *ngIf="motion.state"

26
client/src/app/site/motions/components/motion-list/motion-list.component.scss
View File

@ -19,11 +19,27 @@
.mat-column-title { .mat-column-title {
width: 100%; width: 100%;
flex: 1 0 200px; flex: 1 0 200px;
display: block;
padding-left: 10px; padding-left: 10px;
.motion-list-title { .motion-list {
font-weight: 500; display: flex;
font-size: 16px; padding-right: 20px;
.motion-list-title,
.motion-list-from {
flex: 2;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.motion-list-title {
font-weight: 500;
font-size: 16px;
}
.favorite-star {
width: 26px;
}
} }
.motion-list-from { .motion-list-from {
@ -58,3 +74,7 @@
justify-content: flex-end !important; justify-content: flex-end !important;
} }
} }
.max-width {
width: 100%;
}