Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 6161425

Browse files
authored
Merge pull request #401 from sinfo/staging
Update 2.3.9
2 parents 6f4f071 + 17c9a1b commit 6161425

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

src/app/landing-page/landing-page.component.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
.example-card {
1111
margin: 5%;
12-
display: flex;
12+
/*display: flex;*/
1313
justify-content: center;
1414
/* align horizontal */
1515
align-items: center;
@@ -313,7 +313,6 @@
313313
}
314314

315315
.example-card {
316-
317316
transition: all .1s linear;
318317
box-shadow: 0px 1px 2px 0px rgba(26, 11, 82, 0.4);
319318
}
@@ -328,8 +327,9 @@
328327

329328
.offers {
330329
display: grid;
331-
width: 100%;
330+
/*width: 100%;*/
332331
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
333332
row-gap: 2rem;
334333
column-gap: 1rem;
335-
}
334+
justify-content: center;
335+
}

src/app/landing-page/landing-page.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ <h2 class="text-center">Offers</h2>
481481
Take advantage of exclusive offers from our partners!
482482
</p>
483483
<div class="offers">
484-
<mat-card class="example-card cursor-pointer" style="padding: 5%">
485-
<a href="https://www.flytap.com"><img src="https://static.sinfo.org/static/31-sinfo/offers/tap.jpg" /></a>
484+
<mat-card class="example-card cursor-pointer" style="padding: 2%;width: 250px;margin-left: 40%;">
485+
<a href="https://www.flytap.com"><img src="https://static.sinfo.org/static/31-sinfo/offers/tap.jpg"/></a>
486486
<div class="text-alt description">
487487
<small>Official Carrier of SINFO 31</small>
488488
</div>

src/app/speakers/speakers.component.html

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
<section *ngIf="speakers && speakers.length > 0" id="speakers" class="section align-center">
44

55
<div class="container">
6-
<span class="icon section-icon icon-faces-users-03"></span> <!-- TODO: Remove "Previous" when speakers are updated -->
7-
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="!previousSpeakers && speakers.length > 0">Previous Speakers<mat-icon
8-
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed" class="cursor-pointer">
6+
<span class="icon section-icon icon-faces-users-03"></span>
7+
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="speakers.length > 0">
8+
{{ previousSpeakers ? 'Previous Speakers' : 'Speakers'}}
9+
<mat-icon
10+
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed">
911
expand_more
1012
</mat-icon>
1113
</h3>
1214
<p *ngIf="!previousSpeakers && speakers.length > 0" style="text-align: center">Check out our wonderful speakers,
1315
primed and ready to tell their
1416
stories and give you their advice. Don't miss their keynotes!</p>
15-
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="previousSpeakers && speakers.length > 0">Previous Speakers<mat-icon
16-
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed">
17-
expand_more
18-
</mat-icon>
19-
</h3>
2017
<br />
2118
<br />
2219

0 commit comments

Comments
 (0)