Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/myclubapp/app into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sansan88 committed Dec 10, 2023
2 parents d6228d4 + 6b72335 commit 303abac
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ <h2>{{game.spectators}}</h2>
</ion-fab-button>

<ion-fab-button
class="myclubStatus"
(click)="toggle(true, game)"
size="small"
color="danger"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@ <h3 *ngIf="game.result">
<!-- RANKING -->
<ng-container *ngIf="mode=='ranking'">
<ng-container *ngIf="teamRankings$ | async as teamRankings">
<ion-list [inset]="true">
<ion-accordion-group [multiple]="true" [value]="teamRankings[0].teamId">
<div *ngFor="let entry of teamRankings">
<ion-accordion value="{{entry.teamId}}">
<ion-item slot="header" color="light">
<ion-label class="ion-text-wrap"
>{{entry.details.title}}</ion-label
>
>{{entry.details.title}}</ion-label>
</ion-item>
<div slot="content">
<ion-list>
Expand All @@ -267,7 +267,7 @@ <h3 *ngIf="game.result">
</ion-grid>
</ion-item>

<ion-item *ngFor="let ranking of entry.rankings">
<ion-item class="myclubPadding" *ngFor="let ranking of entry.rankings">
<ion-grid>
<ion-row class="ion-align-items-center">
<ion-col size="1">
Expand All @@ -292,6 +292,7 @@ <h3 *ngIf="game.result">
</ion-accordion>
</div>
</ion-accordion-group>
</ion-list>

<!--<ion-list *ngFor="let entry of teamRankings" lines="full">
<ion-list-header>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.myclubPadding {
--padding-start: 0;
--inner-padding-end: p;
}
1 change: 0 additions & 1 deletion src/app/pages/event/event-detail/event-detail.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ <h2>{{event.description}}</h2>
</ion-fab-button>

<ion-fab-button
class="myclubStatus"
(click)="toggle(true, event)"
size="small"
color="danger"
Expand Down
1 change: 0 additions & 1 deletion src/app/pages/helfer/helfer-detail/helfer-detail.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ <h2>{{schicht.timeFrom}} {{schicht.timeTo}}</h2>
</ion-fab-button>

<ion-fab-button
class="myclubStatus"
(click)="toggle(true, event)"
size="small"
color="danger"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ <h2>{{training.description}}</h2>
</ion-fab-button>

<ion-fab-button
class="myclubStatus"
(click)="toggle(true, training)"
size="small"
color="danger"
Expand Down

0 comments on commit 303abac

Please sign in to comment.