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

Merge pull request #4301 from MaximilianKrambach/moveStar

Browse Source 
move favorite star to identifier
This commit is contained in:
Emanuel Schütze 2019-02-12 21:27:26 +01:00 committed by GitHub
commit a410930245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,9 @@
<ng-container matColumnDef="identifier"> <ng-container matColumnDef="identifier">
<mat-header-cell *matHeaderCellDef mat-sort-header>Identifier</mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Identifier</mat-header-cell>
<mat-cell *matCellDef="let motion"> <mat-cell *matCellDef="let motion">
<div class="innerTable">{{ motion.identifier }}</div> <div class="innerTable">
{{ motion.identifier }}
</div>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -57,6 +59,10 @@
<div class="innerTable max-width"> <div class="innerTable max-width">
<!-- title line --> <!-- title line -->
<div class="motion-list"> <div class="motion-list">
<!-- favorite icon -->
<span *ngIf="motion.star" class="favorite-star">
<mat-icon inline>star</mat-icon>
</span>
<!-- attachment icon --> <!-- attachment icon -->
<span class="attached-files" *ngIf="motion.hasAttachments()"> <span class="attached-files" *ngIf="motion.hasAttachments()">
<mat-icon>attach_file</mat-icon> <mat-icon>attach_file</mat-icon>
@ -65,10 +71,6 @@
<span class="motion-list-title"> <span class="motion-list-title">
{{ motion.title }} {{ motion.title }}
</span> </span>
<!-- favorite icon -->
<span *ngIf="motion.star" class="favorite-star">
<mat-icon inline>star</mat-icon>
</span>
</div> </div>
<!-- submitters line --> <!-- submitters line -->
<div class="motion-list"> <div class="motion-list">
@ -92,7 +94,9 @@
<!-- recommendation --> <!-- recommendation -->
<span *ngIf="motion.recommendation && motion.state.next_states_id.length > 0"> <span *ngIf="motion.recommendation && motion.state.next_states_id.length > 0">
<mat-basic-chip class="bluegrey" [disabled]="true">{{ getRecommendationLabel(motion) }} </mat-basic-chip> <mat-basic-chip class="bluegrey" [disabled]="true">
{{ getRecommendationLabel(motion) }}
</mat-basic-chip>
</span> </span>
</div> </div>
</mat-cell> </mat-cell>

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

@ -38,7 +38,7 @@
font-size: 16px; font-size: 16px;
} }
.favorite-star { .favorite-star {
width: 26px; padding-right: 3px;
} }
} }