Skip to content

Commit 4097fe7

Browse files
anibalsolonRemi-Gau
authored andcommitted
TAs
1 parent 0f5f4b8 commit 4097fe7

File tree

6 files changed

+54
-15
lines changed

6 files changed

+54
-15
lines changed

_data/teaching_assistants.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
21
anibal_solon:
32
name: "Anibal"
43
surname: "Solon"
54
location: "Austin, Texas, USA"
65
hub: Americas
6+
thumbnailUrl: anibal_solon.jpg
77
social:
88
- {name: "twitter", link: "https://twitter.com/anibalsolon"}
99
- {name: "github", link: "https://github.com/anibalsolon"}

_includes/schedule.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<section id="schedule" class="schedule" style="max-width: 1200px; margin: 0 auto;">
44
<div class="content-wrapper" style="margin: 0 1em;">
55
<div style="margin:0 auto;text-align:left;max-width:450px;" class="tz-selector">
6-
<label for=timezone>Schedule times are currently displayed in the following time zone:</label><select id="timezone" data-base-tz="{{ schedule[0].tz }}"></select>
6+
<label for=timezone>Schedule times are currently displayed in the following time zone:</label>
7+
<select id="timezone" data-time-selector="#schedule .schedule-table time" data-base-tz="{{ schedule[0].tz }}"></select>
78
</div>
89

910
{% for day in schedule %}

_includes/sessions-modals.html

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h4>{{ session.title }}</h4>
5959
<div class="col-md-2 col-sm-2">
6060
<div class="flow-img img-circle people-img" style="background-image: url({{ site.baseurl | append: '/img/team/' | append: speaker.thumbnailUrl }})"></div>
6161
</div>
62-
<div class="col-md-10 col-sm-10 details">
62+
<div class="col-md-10 col-sm-10 col-xs-10 details">
6363
<p class="name">
6464
{{ speaker.name }} {{ speaker.surname }}
6565
<span class="position">{% if speaker.title %}{{ speaker.title }},{% endif %} {{ speaker.company }}</span>
@@ -79,6 +79,36 @@ <h4>{{ session.title }}</h4>
7979
</div>
8080
</div>
8181
{% endfor %}
82+
{% if page.schedule != null and session.teaching_assistants[page.schedule].size > 0 %}
83+
<hr />
84+
<h5>Teaching Assistants</h5>
85+
{% for session_ta in session.teaching_assistants[page.schedule] %}
86+
{% assign ta = site.data.teaching_assistants[session_ta] %}
87+
<div class="row">
88+
<div class="col-md-2 col-sm-2 col-xs-2">
89+
<div class="flow-img img-circle people-img" style="background-image: url({{ site.baseurl | append: '/img/people/' | append: ta.thumbnailUrl }})"></div>
90+
</div>
91+
<div class="col-md-10 col-sm-10 col-xs-10 details">
92+
<p class="name">
93+
{{ ta.name }} {{ ta.surname }}
94+
<span class="position">{% if ta.title %}{{ ta.title }},{% endif %} {{ ta.company }}</span>
95+
{% if ta.location %}<span class="position">{{ ta.location }}</span>{% endif %}
96+
</p>
97+
<ul class="social">
98+
{% for social in ta.social %}
99+
<li>
100+
<a href="{{ social["link"] }}" target="_blank">
101+
<svg class="icon icon-{{ social["name"] }}" viewBox="0 0 30 32">
102+
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-{{ social["name"] }}"></use>
103+
</svg>
104+
</a>
105+
</li>
106+
{% endfor %}
107+
</ul>
108+
</div>
109+
</div>
110+
{% endfor %}
111+
{% endif %}
82112
</div>
83113
</div>
84114
</div>

_sass/partials/_modal.scss

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ $modal-highlight-color: #212121;
2222
font-size: 29px;
2323
}
2424
}
25+
h5 {
26+
font-size: 20px;
27+
font-weight: $regular;
28+
color: $modal-highlight-color;
29+
@media (max-width: 767px) {
30+
font-size: 18px;
31+
}
32+
}
2533
}
2634
.modal-backdrop {
2735
position: fixed;
@@ -70,17 +78,17 @@ $modal-highlight-color: #212121;
7078
margin-top: 20px;
7179
}
7280
.people-img {
73-
width: 100px;
74-
height: 100px;
75-
margin: 10px;
81+
width: 80px;
82+
height: 80px;
83+
margin: 0 auto;
7684
@media (max-width: 767px) {
77-
width: 120px;
78-
height: 120px;
79-
margin: 10px auto;
85+
width: 60px;
86+
height: 60px;
87+
margin: 0 10px;
8088
}
8189
}
8290
.details {
83-
padding-left: 30px;
91+
padding: 0;
8492
@media (max-width: 767px) {
8593
padding: 0;
8694
}
@@ -99,7 +107,7 @@ $modal-highlight-color: #212121;
99107
padding: 0;
100108
list-style: none;
101109
@media (max-width: 767px) {
102-
text-align: center;
110+
// text-align: center;
103111
}
104112
li {
105113
display: inline-block;

css/main.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/scripts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
if(window.location.href.indexOf("schedule") > -1 && window.location.hash) {
104104
var hash = window.location.hash;
105105
$(hash).click();
106-
}
106+
}
107107
});
108108

109109
$(function() {
@@ -484,7 +484,7 @@
484484
setDirectionInput(origin);
485485
$('#find-way h3').removeClass('fadeInUp').addClass('fadeOutDown');
486486
}
487-
487+
488488
function calcRouteFromMyLocation() {
489489
if (navigator.geolocation) {
490490
navigator.geolocation.getCurrentPosition(function(position) {

0 commit comments

Comments
 (0)