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

Commit 0d367f4

Browse files
andreromaoandreromao
authored
Merge pull request #409 from sinfo/staging
Update 2.3.10
2 parents 6161425 + d279629 commit 0d367f4

24 files changed

+89
-211
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ <h6 class="lead">Are you new to the job market? Or maybe looking for a new chall
339339

340340
<app-team *ngIf="eventId" [eventId]="eventId"></app-team>
341341

342-
343342
<section #newsletter class="section bg-cover overlay newsletterbg light-text align-center">
344343
<div class="container">
345344
<h2>
@@ -405,7 +404,7 @@ <h6>About</h6>
405404
city of Portugal, Lisbon. We had a record breaking attendance of participants last year, achievement
406405
we
407406
hope
408-
to repeat next year, from <b>the 15th to the 19th of April 2024</b>.
407+
to repeat this year, from <b>the 15th to the 19th of April 2024</b>.
409408
</p>
410409
</div>
411410
</div>
@@ -444,7 +443,7 @@ <h6>Vision</h6>
444443
Science
445444
and
446445
IT play fundamental
447-
roles. For the last 29 editions SINFO has been the bridge between that world and the student
446+
roles. For the last 30 editions SINFO has been the bridge between that world and the student
448447
community.
449448
Every
450449
single one of them sums up several months of dedication and hard work laid out by its members, who
@@ -531,11 +530,10 @@ <h2 class="text-center">Frequently Asked Questions</h2>
531530
<mat-panel-title>
532531
<mat-icon class="faq-chev">{{panel2.expanded ? 'keyboard_arrow_up' :
533532
'keyboard_arrow_down'}}</mat-icon>
534-
<span class="faq-title">How can I attend SINFO 31?</span>
533+
<span class="faq-title">Where is SINFO 31 taking place?</span>
535534
</mat-panel-title>
536535
</mat-expansion-panel-header>
537-
<p>We're back to our venue! From the 15th to the 19th of April, 2024, pay a visit to the
538-
Alameda Campus of Instituto Superior Técnico, in Lisbon, and you'll surely spot our venue!
536+
<p>Our venue changed place this year. Visit us at Técnico Innovation Center, in Lisbon, from the 15th to the 19th of April, 2024!
539537
</p>
540538
</mat-expansion-panel>
541539

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

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ div.sponsors.silver div.sponsor {
8181
}
8282
}
8383

84-
h1,
85-
h2 {
86-
margin: 0px;
87-
}
88-
89-
9084
.wrapper {
9185
margin: 10dvh
9286
5dvh
@@ -115,26 +109,6 @@ div.sponsors {
115109
margin-bottom: 5%;
116110
}
117111

118-
@media (max-width: 767px) {
119-
120-
.chev-open,
121-
.chev-close {
122-
font-size: 9vw;
123-
}
124-
125-
126-
}
127-
128-
@media (max-width: 480px) {
129-
130-
.chev-open,
131-
.chev-close {
132-
font-size: 9vw;
133-
}
134-
135-
136-
}
137-
138112
h1,
139113
h2 {
140114
margin: 0px;
@@ -227,13 +201,12 @@ h2 {
227201
align-items: center;
228202
}
229203

230-
@media (max-width: 925px) {
231-
204+
@media (max-width: 767px){
232205
.chev-open,
233206
.chev-close {
234-
font-size: 9vw;
207+
font-size: 31.5px;
235208
}
236-
}
209+
}
237210

238211
*:not(mat-icon) {
239212
font-family: 'Montserrat' !important;

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44
<section *ngIf="sessions && sessions.length" id="schedule" class="section schedule-section align-center">
55
<div class="container">
66
<span class="icon section-icon icon-office-21"></span>
7-
<h3>Schedule - TBA</h3>
8-
<strong id="subtitle">All times displayed in the schedule are relative to Lisbon's timezone, GMT+00:00</strong>
7+
<h3>Schedule</h3>
8+
<strong id="subtitle">All times displayed in the schedule are relative to Lisbon's timezone, GMT+01:00</strong>
99
<br />
1010

1111
<br />
12-
<!-- TODO: Uncoment when information is updated-->
13-
<!-- <a class="btn btn-sm btn-outline-clr ics" href="https://deck.sinfo.org/calendar.ics" target="_blank" style="margin-bottom: 50px">
12+
<a class="btn btn-sm btn-outline-clr ics" href="https://deck.sinfo.org/calendar.ics" target="_blank" style="margin-bottom: 50px">
1413
Download calendar
1514
<span class="fa fa-download icon"></span>
1615
</a>
1716

1817
<app-loading [content]="schedule">
19-
</app-loading> -->
18+
</app-loading>
2019

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

2523
<mat-tab-group dynamicHeight style="padding-left: 5%; padding-right: 5%;">
2624
<mat-tab *ngFor="let day of schedule; let i=index" dynamicHeight>
@@ -31,7 +29,7 @@ <h3>Schedule - TBA</h3>
3129
<h6 class="highlight">{{day.theme}}</h6>
3230
</div>
3331
<div>
34-
<h8 class="text-alt">{{day.date | date:'dd-MM-yyyy':'+0000'}}</h8>
32+
<h8 class="text-alt">{{day.date | date:'dd-MM-yyyy':'+0100'}}</h8>
3533
</div>
3634
</div>
3735
</ng-template>
@@ -54,7 +52,7 @@ <h6 class="highlight">Presentations</h6>
5452
<div mat-card-avatar> <img appImage [url]="presentation.img" alt=""> </div>
5553
<mat-card-title><strong class="time highlight">
5654
<span class="icon icon-office-24"></span>
57-
{{presentation.date | date:'shortTime':'+0000'}}
55+
{{presentation.date | date:'shortTime':'+0100'}}
5856
<span class="icon icon-office-47 place"></span>
5957
{{presentation.place}}
6058
</strong></mat-card-title>
@@ -90,7 +88,7 @@ <h6 class="highlight">Keynotes</h6>
9088
<mat-card-title>
9189
<strong class="time highlight">
9290
<span class="icon icon-office-24"></span>
93-
{{session.date | date:'shortTime':'+0000'}}
91+
{{session.date | date:'shortTime':'+0100'}}
9492
<span class="icon icon-office-47 place"></span>
9593
{{session.place}}
9694
</strong>
@@ -134,7 +132,7 @@ <h6 class="highlight">Workshops</h6>
134132
<div mat-card-avatar> <img appImage [url]="workshop.img" alt=""> </div>
135133
<mat-card-title><strong class="time highlight">
136134
<span class="icon icon-office-24"></span>
137-
{{workshop.date | date:'shortTime':'+0000'}}
135+
{{workshop.date | date:'shortTime':'+0100'}}
138136
<span class="icon icon-office-47 place"></span>
139137
{{workshop.place}}
140138
</strong></mat-card-title>
@@ -159,13 +157,13 @@ <h6 class="title">{{workshop.name}}</h6>
159157
<!-- <div class="nav-wrapper" (window:resize)="showOrHideDropdown()">
160158
<span class="nav-current" (click)="toggleDayDropdown()">
161159
<h5 class="highlight"> {{ selectedTheme }}</h5>
162-
<p class="text-alt">{{ selectedTime | date:'dd-MM-yyyy':'+0000'}}</p>
160+
<p class="text-alt">{{ selectedTime | date:'dd-MM-yyyy':'+0100'}}</p>
163161
</span>
164162
<ul *ngIf="displayDayDropdown" class="nav nav-schedule nav-day">
165163
<li *ngFor="let day of schedule; let i=index" [ngClass]="{'active': selectedTheme === day.theme}">
166164
<a (click)="updateSelectedDayText(day.theme, day.date)">
167165
<h5 class="highlight">{{day.theme}}</h5>
168-
<p class="text-alt">{{day.date | date:'dd-MM-yyyy':'+0000'}}</p>
166+
<p class="text-alt">{{day.date | date:'dd-MM-yyyy':'+0100'}}</p>
169167
</a>
170168
</li>
171169
</ul>
@@ -206,7 +204,7 @@ <h5 class="highlight">{{day.theme}}</h5>
206204
<a (click)="onSelect(session)" class="schedule-item-header">
207205
<strong class="time highlight">
208206
<span class="icon icon-office-24"></span>
209-
{{session.date | date:'shortTime':'+0000'}}
207+
{{session.date | date:'shortTime':'+0100'}}
210208
<span class="icon icon-office-47 place"></span>
211209
{{session.place}}
212210
</strong>
@@ -246,7 +244,7 @@ <h6 class="title">
246244
<a (click)="onSelect(presentation)" class="schedule-item-header">
247245
<strong class="time highlight">
248246
<span class="icon icon-office-24"></span>
249-
{{presentation.date | date:'shortTime':'+0000'}}
247+
{{presentation.date | date:'shortTime':'+0100'}}
250248
<span class="icon icon-office-47 place"></span>
251249
{{presentation.place}}
252250
</strong>
@@ -280,7 +278,7 @@ <h6 class="title">{{presentation.name}}
280278
<a (click)="onSelect(presentation)" class="schedule-item-header">
281279
<strong class="time highlight">
282280
<span class="icon icon-office-24"></span>
283-
{{presentation.date | date:'shortTime':'+0000'}}
281+
{{presentation.date | date:'shortTime':'+0100'}}
284282
<span class="icon icon-office-47 place"></span>
285283
{{presentation.place}}
286284
</strong>
@@ -321,7 +319,7 @@ <h6 class="title">{{presentation.name}}
321319
<a (click)="onSelect(workshop)" class="schedule-item-header">
322320
<strong class="time highlight">
323321
<span class="icon icon-office-24"></span>
324-
{{workshop.date | date:'shortTime':'+0000'}}
322+
{{workshop.date | date:'shortTime':'+0100'}}
325323
<span class="icon icon-office-47 place"></span>
326324
{{workshop.place}}
327325
</strong>
@@ -354,7 +352,7 @@ <h6 class="title">{{workshop.name}}
354352
<a (click)="onSelect(workshop)" class="schedule-item-header">
355353
<strong class="time highlight">
356354
<span class="icon icon-office-24"></span>
357-
{{workshop.date | date:'shortTime':'+0000'}}
355+
{{workshop.date | date:'shortTime':'+0100'}}
358356
<span class="icon icon-office-47 place"></span>
359357
{{workshop.place}}
360358
</strong>

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

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,6 @@ div.sponsors {
2727
margin-bottom: 5%;
2828
}
2929

30-
@media (max-width: 767px) {
31-
32-
.chev-open,
33-
.chev-close {
34-
font-size: 9vw;
35-
}
36-
37-
38-
}
39-
40-
@media (max-width: 480px) {
41-
42-
.chev-open,
43-
.chev-close {
44-
font-size: 9vw;
45-
}
46-
47-
48-
}
49-
5030
h1,
5131
h2 {
5232
margin: 0px;
@@ -69,11 +49,6 @@ h2 {
6949
transform: rotate(180deg);
7050
}
7151

72-
.h3 {
73-
display: flex;
74-
justify-content: center;
75-
}
76-
7752
.chev-close {
7853
line-height: 1.2;
7954
position: absolute;
@@ -84,6 +59,12 @@ h2 {
8459
transform: rotate(0);
8560
}
8661

62+
.h3,
63+
.h4 {
64+
display: flex;
65+
justify-content: center;
66+
}
67+
8768
.speaker-card {
8869
color: white;
8970
background-size: contain;
@@ -139,11 +120,10 @@ h2 {
139120
align-items: center;
140121
}
141122

142-
@media (max-width: 925px) {
143-
123+
@media (max-width: 767px){
144124
.chev-open,
145125
.chev-close {
146-
font-size: 9vw;
126+
font-size: 30px;
147127
}
148128
}
149129

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,28 @@
55
<div *ngIf="sponsors && sponsors.length > 0">
66
<div class="overallSponsors">
77
<span class="icon section-icon icon-documents-bookmarks-12"></span>
8-
<h3 (click)="show()">Sponsors<mat-icon [class.chev-open]="showAll" [class.chev-close]="!showAll" class="cursor-pointer">
9-
expand_more
10-
</mat-icon>
11-
</h3>
8+
<h3>Sponsors</h3>
129
<p style="text-align: center">Get to know our amazing sponsors, who make it all possible!</p>
1310
<br />
1411

1512
<app-loading [content]="sponsors"></app-loading>
1613

1714
<div class="sponsor-level" *ngIf="sponsors">
18-
19-
15+
2016
<h5>Platinum Sponsors</h5>
2117
<div class="row" *ngIf="platinums.length">
2218
<mat-card class="example-card speaker-card platinum cursor-pointer" *ngFor="let platinum of platinums"
2319
(click)="onSelect(platinum)" [ngStyle]="{'background-image': 'url(' + platinum.img + ')' }">
2420
</mat-card>
2521
</div>
22+
<br />
23+
24+
<h4 (click)="show()">See more
25+
<mat-icon [class.chev-open]="showAll" [class.chev-close]="!showAll" class="cursor-pointer">
26+
expand_more
27+
</mat-icon>
28+
</h4>
29+
<br />
2630

2731
<div *ngIf="showAll" @myInsertRemoveTrigger class="sponsor-level">
2832
<hr>
@@ -42,14 +46,6 @@ <h5>Silver Sponsors</h5>
4246
</div>
4347

4448
</div>
45-
46-
<!-- <div class="show">
47-
<button *ngIf="!showAll" class="btn btn-outline-clr btn-sm" (click)="show()">
48-
See more
49-
</button>
50-
</div>
51-
</div> -->
52-
5349
</div>
5450

5551
<div *ngIf="!sponsors || sponsors.length == 0" class="sponsors">

‎src/app/partials/footer/footer.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<div class="col-md-3">
5252
<ul class="list">
5353
<li class="">
54-
<i class="fa fa-map-marker"></i><a href="https://goo.gl/maps/9NQdxy8svXL2" target="_blank">IST, Lisbon</a>
54+
<i class="fa fa-map-marker"></i><a href="https://maps.app.goo.gl/aWyFo6cyreD8k8nLA" target="_blank">Técnico Innovation Center, Lisbon</a>
5555
</li>
5656
<li class="">
5757
<i class="fa fa-envelope"></i>

‎src/app/session/session.component.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ p {
1919
}
2020

2121
.speaker-img {
22-
border-radius: 50%;
22+
border-radius: 15px;
23+
max-height: 300px;
2324
}
2425

2526
.session-details h5 {

‎src/app/session/session.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ <h2 class="kind">{{session.kind}}</h2>
110110
<h3 class="name">{{session.name}}</h3>
111111
<div class="session-details">
112112
<div class="padded">
113-
<p> <i class="fa fa-calendar"></i> {{session.date | date:'fullDate':'+0000'}} </p>
113+
<p> <i class="fa fa-calendar"></i> {{session.date | date:'fullDate':'+0100'}} </p>
114114
</div>
115115
<div class="padded">
116-
<p> <i class="fa fa-clock-o"></i> {{session.date | date:'shortTime':'+0000'}} </p>
116+
<p> <i class="fa fa-clock-o"></i> {{session.date | date:'shortTime':'+0100'}} </p>
117117
</div>
118118
<div *ngIf="session.place">
119119
<p> <i class="fa fa-map-marker"></i> {{session.place}} </p>

‎src/app/speakers/speaker/speaker.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ <h2 class="kind">{{session.kind}}</h2>
8989
<h3 class="name">{{session.name}}</h3>
9090
<div class="session-details">
9191
<div class="padded">
92-
<p> <i class="fa fa-calendar"></i> {{session.date | date:'fullDate':'+0000'}} </p>
92+
<p> <i class="fa fa-calendar"></i> {{session.date | date:'fullDate':'+0100'}} </p>
9393
</div>
9494
<div class="padded">
95-
<p> <i class="fa fa-clock-o"></i> {{session.date | date:'shortTime':'+0000'}} </p>
95+
<p> <i class="fa fa-clock-o"></i> {{session.date | date:'shortTime':'+0100'}} </p>
9696
</div>
9797
<div *ngIf="session.place">
9898
<p> <i class="fa fa-map-marker"></i> {{session.place}} </p>

0 commit comments

Comments
 (0)