Skip to content

Commit f156d0b

Browse files
committed
Added missed packet signatures to intro presentations
1 parent 5655dcf commit f156d0b

File tree

3 files changed

+33
-23
lines changed

3 files changed

+33
-23
lines changed

conditional/templates/intro_eval_slideshow.html

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,40 @@
1313
<section id="slide-{{m['uid']}}">
1414
<section>
1515
<h1>{{m['name']}}</h1>
16-
<div class="row">
17-
<div class="col-xs-12 col-md-4">
18-
{% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
19-
<div class="item{% if committee_meetings_passed %} passed{% endif %}" >
20-
<span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
21-
<h3>{{m['committee_meetings']}}</h3>
22-
<p>Meetings</p>
16+
<div class="row">
17+
<div class="col-xs-12 col-md-3">
18+
{% set packet_passed = m['signatures_missed'] == 0 %}
19+
<div class="item{% if packet_passed %} passed{% endif %}" >
20+
<span class="icon glyphicon glyphicon-{% if packet_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
21+
<h3>{{m['signatures_missed']}}</h3>
22+
<p>Signatures Missed</p>
23+
</div>
2324
</div>
24-
</div>
25-
<div class="col-xs-12 col-md-4">
26-
{% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
27-
<div class="item{% if house_meetings_passed %} passed{% endif %}">
28-
<span class="icon glyphicon glyphicon-{% if house_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
29-
<h3>{{m['house_meetings_missed']|length}}</h3>
30-
<p>Absences</p>
25+
<div class="col-xs-12 col-md-3">
26+
{% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
27+
<div class="item{% if committee_meetings_passed %} passed{% endif %}" >
28+
<span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
29+
<h3>{{m['committee_meetings']}}</h3>
30+
<p>Meetings</p>
31+
</div>
3132
</div>
32-
</div>
33-
<div class="col-xs-12 col-md-4">
34-
{% set technical_seminars_passed = m['technical_seminars']|length >= 2 %}
35-
<div class="item{% if technical_seminars_passed %} passed{% endif %}">
36-
<span class="icon glyphicon glyphicon-{% if technical_seminars_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
37-
<h3>{{m['technical_seminars']|length}}</h3>
38-
<p>Seminars</p>
33+
<div class="col-xs-12 col-md-3">
34+
{% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
35+
<div class="item{% if house_meetings_passed %} passed{% endif %}">
36+
<span class="icon glyphicon glyphicon-{% if house_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
37+
<h3>{{m['house_meetings_missed']|length}}</h3>
38+
<p>Absences</p>
39+
</div>
40+
</div>
41+
<div class="col-xs-12 col-md-3">
42+
{% set technical_seminars_passed = m['technical_seminars']|length >= 2 %}
43+
<div class="item{% if technical_seminars_passed %} passed{% endif %}">
44+
<span class="icon glyphicon glyphicon-{% if technical_seminars_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
45+
<h3>{{m['technical_seminars']|length}}</h3>
46+
<p>Seminars</p>
47+
</div>
3948
</div>
4049
</div>
41-
</div>
4250
<h4><span class="icon glyphicon glyphicon-{% if m['freshman_project'] == 'Passed' %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span> Freshman Project</h4>
4351

4452
<div class="actions" data-uid="{{m['uid']}}" data-cn="{{m['name']}}">

frontend/stylesheets/components/_reveal.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ $yellow: #f1c40f;
105105
}
106106
& .item {
107107
position: relative;
108+
margin: 0 auto;
108109
border: 6px solid $red;
109110
border-radius: 20px;
110111
padding: 60px 0 0;
111-
width: 95%;
112+
width: 92%;
112113
height: 100%;
113114
color: #555;
114115
&.passed {

frontend/stylesheets/components/reveal/_white.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ body {
7272
}
7373

7474
.reveal .item p {
75+
font-size: .6em;
7576
font-weight: normal;
7677
}
7778

0 commit comments

Comments
 (0)