Skip to content

Commit

Permalink
Merge pull request #394 from sinfo/staging
Browse files Browse the repository at this point in the history
Update 2.3.4
  • Loading branch information
andreromao authored Nov 29, 2023
2 parents f3337cc + 0a51916 commit feb2542
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion src/app/landing-page/landing-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ <h6 class="thin base-font align-center">Biggest
<mat-divider></mat-divider>

<div #stands>
<app-stands *ngIf="eventId" [eventId]="eventId"></app-stands>
<!-- TODO: Change false to event ID when stands are updated-->
<app-stands *ngIf="false" [eventId]="eventId"></app-stands>
</div>
<mat-divider></mat-divider>

Expand Down
14 changes: 7 additions & 7 deletions src/app/landing-page/schedule/schedule.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@
<section *ngIf="sessions && sessions.length" id="schedule" class="section schedule-section align-center">
<div class="container">
<span class="icon section-icon icon-office-21"></span>
<h3>Schedule</h3>
<h3>Schedule - TBA</h3>
<strong id="subtitle">All times displayed in the schedule are relative to Lisbon's timezone, GMT+00:00</strong>
<br />

<br />

<a class="btn btn-sm btn-outline-clr ics" href="https://deck.sinfo.org/calendar.ics" target="_blank" style="margin-bottom: 50px">
<!-- TODO: Uncoment when information is updated-->
<!-- <a class="btn btn-sm btn-outline-clr ics" href="https://deck.sinfo.org/calendar.ics" target="_blank" style="margin-bottom: 50px">
Download calendar
<span class="fa fa-download icon"></span>
</a>
<app-loading [content]="schedule">
</app-loading>
</app-loading> -->

<!-- Schedule start -->
<div *ngIf="schedule" class="schedule">
<!-- <div *ngIf="schedule" class="schedule"> | TODO: Change to this when information is updated-->
<div *ngIf="false" class="schedule">

<mat-tab-group dynamicHeight style="padding-left: 5%; padding-right: 5%;">
<mat-tab *ngFor="let day of schedule; let i=index" dynamicHeight>
Expand All @@ -35,8 +36,7 @@ <h6 class="highlight">{{day.theme}}</h6>
</div>
</ng-template>
<!-- Tab Content -->
<mat-tab-group dynamicHeight style="margin-top: 5dvh
">
<mat-tab-group dynamicHeight style="margin-top: 5dvh">

<!-- Presentations -->
<mat-tab>
Expand Down
4 changes: 2 additions & 2 deletions src/app/speakers/speakers.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<section *ngIf="speakers && speakers.length > 0" id="speakers" class="section align-center">

<div class="container">
<span class="icon section-icon icon-faces-users-03"></span>
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="!previousSpeakers && speakers.length > 0">Speakers<mat-icon
<span class="icon section-icon icon-faces-users-03"></span> <!-- TODO: Remove "Previous" when speakers are updated -->
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="!previousSpeakers && speakers.length > 0">Previous Speakers<mat-icon
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed" class="cursor-pointer">
expand_more
</mat-icon>
Expand Down

0 comments on commit feb2542

Please sign in to comment.