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

Update 2.3.9 #401

Merged
merged 5 commits into from
Mar 17, 2024
Merged

Update 2.3.9 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0209e55
fixed width in offer cards css
inescvalves Mar 3, 2024
9231498
Merge pull request #399 from sinfo/ines
PMax5 Mar 10, 2024
76363b1
fix: set speakers title dynamic
nalves599 Mar 10, 2024
8d3369d
Merge pull request #400 from sinfo/fix-speakers-title
PMax5 Mar 10, 2024
17c9a1b
Merge branch 'master' into staging
PMax5 Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/app/landing-page/landing-page.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

.example-card {
margin: 5%;
display: flex;
/*display: flex;*/
justify-content: center;
/* align horizontal */
align-items: center;
Expand Down Expand Up @@ -313,7 +313,6 @@
}

.example-card {

transition: all .1s linear;
box-shadow: 0px 1px 2px 0px rgba(26, 11, 82, 0.4);
}
Expand All @@ -328,8 +327,9 @@

.offers {
display: grid;
width: 100%;
/*width: 100%;*/
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
row-gap: 2rem;
column-gap: 1rem;
}
justify-content: center;
}
4 changes: 2 additions & 2 deletions src/app/landing-page/landing-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ <h2 class="text-center">Offers</h2>
Take advantage of exclusive offers from our partners!
</p>
<div class="offers">
<mat-card class="example-card cursor-pointer" style="padding: 5%">
<a href="https://www.flytap.com"><img src="https://static.sinfo.org/static/31-sinfo/offers/tap.jpg" /></a>
<mat-card class="example-card cursor-pointer" style="padding: 2%;width: 250px;margin-left: 40%;">
<a href="https://www.flytap.com"><img src="https://static.sinfo.org/static/31-sinfo/offers/tap.jpg"/></a>
<div class="text-alt description">
<small>Official Carrier of SINFO 31</small>
</div>
Expand Down
13 changes: 5 additions & 8 deletions src/app/speakers/speakers.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@
<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> <!-- 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">
<span class="icon section-icon icon-faces-users-03"></span>
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="speakers.length > 0">
{{ previousSpeakers ? 'Previous Speakers' : 'Speakers'}}
<mat-icon
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed">
expand_more
</mat-icon>
</h3>
<p *ngIf="!previousSpeakers && speakers.length > 0" style="text-align: center">Check out our wonderful speakers,
primed and ready to tell their
stories and give you their advice. Don't miss their keynotes!</p>
<h3 (click)="isCollapsed = !isCollapsed" *ngIf="previousSpeakers && speakers.length > 0">Previous Speakers<mat-icon
[class.chev-open]="!isCollapsed" [class.chev-close]="isCollapsed">
expand_more
</mat-icon>
</h3>
<br />
<br />

Expand Down