Skip to content
This repository was archived by the owner on Jun 9, 2020. It is now read-only.

Commit d244ab4

Browse files
tylermenezestylermenezes
committed
Bump CSS version
1 parent 4ef3042 commit d244ab4

File tree

7 files changed

+98
-17
lines changed

7 files changed

+98
-17
lines changed

‎public/assets/css/style.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/assets/css/style.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/assets/sass/pages/school.sass‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,68 @@ body.event.school, body.event.groups
134134
text-align: center
135135
clear: both
136136

137+
article.schedule
138+
.day
139+
+span-columns(6)
140+
h4
141+
font:
142+
family: $font-family-header
143+
weight: 700
144+
size: 1.1rem
145+
ul
146+
padding: 0
147+
li
148+
+row
149+
list-style-type: none
150+
padding: 0.5rem
151+
border-bottom: 1px solid $color-gray
152+
span, a
153+
font:
154+
family: $font-family-header
155+
size: 1rem
156+
.time
157+
+span-columns(3)
158+
color: $color-gray
159+
display: inline-block
160+
.task
161+
+span-columns(9)
162+
+omega
163+
position: relative
164+
border-left: 4px solid $color-blue
165+
background-color: lighten($color-blue, 45%)
166+
color: darken($color-blue, 25%)
167+
padding: 0.4rem 0.5rem 0.4rem 0.5rem
168+
width: 60%
169+
display: inline-block
170+
&.event
171+
border-left-color: $color-red
172+
background-color: lighten($color-red, 25%)
173+
color: darken($color-red, 25%)
174+
175+
.popup
176+
display: none
177+
position: absolute
178+
left: 102%
179+
top: 50%
180+
width: 12em
181+
padding: 0.5em 1em
182+
z-index: 100
183+
background-color: $color-gray
184+
color: $color-white
185+
&:before
186+
content: ""
187+
width: 0px
188+
height: 0px
189+
border-width: 9px
190+
border-style: solid
191+
border-color: $color-gray transparent transparent
192+
font-size: 0px
193+
line-height: 0
194+
position: absolute
195+
top: 0px
196+
left: -9px
197+
198+
&:hover .popup
199+
display: block
200+
201+

‎resources/lang/en_US/common.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
'nav-sponsor' => 'Sponsor',
2828
'nav-press' => 'Press Kit',
2929
'nav-donate' => 'Donate',
30+
'nav-schools' => 'Schools',
3031
];

‎resources/views/event.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
</li>
136136
<li>
137137
<span class="q">{{ i18n('event.faq-school-q') }}</span>
138-
<p>{{ i18n('event.faq-school-a', {'link': langPrefix~'/'~event.webname~'/register/schools'}) }}</p>
138+
<p>{{ i18n('event.faq-school-a', {'link': langPrefix~'/'~event.webname~'/schools'}) }}</p>
139139
</li>
140140
<li class="ask">
141141
<span class="q">

‎resources/views/schools.twig‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,33 @@
108108
</section>
109109
</article>
110110
{% endif %}
111+
{% if event %}
112+
<article class="schedule">
113+
<h3>{{ i18n('event.schedule') }}</h3>
114+
{% for day,entries in event.schedule %}
115+
<section class="day">
116+
<div class="schedule">
117+
<h4>{{ day }}</h4>
118+
<ul>
119+
{% for entry in entries %}
120+
<li>
121+
<span class="time">{{ entry.hour }}</span>
122+
<span class="task {{ entry.type }}">
123+
{% if entry.url %}<a target="_blank" href="{{ entry.url }}">{% endif %}
124+
{{ entry.title }}
125+
{% if entry.url %}</a>{% endif %}
126+
{% if entry.description %}
127+
<span class="popup">{{ entry.description }}</span>
128+
{% endif %}
129+
</span>
130+
</li>
131+
{% endfor %}
132+
</ul>
133+
</div>
134+
</section>
135+
{% endfor %}
136+
</article>
137+
{% endif %}
111138
<article class="faq">
112139
<h3>FAQ</h3>
113140
<ul>

‎resources/views/template.twig‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
{# Styling #}
7272
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1" />
73-
<link rel="stylesheet" href="/assets/css/style.css?v=09281985" />
73+
<link rel="stylesheet" href="/assets/css/style.css?v=09281999" />
7474
{% if event and event.custom_css %}
7575
<style type="text/css">
7676
{{ event.custom_css }}
@@ -110,24 +110,12 @@
110110
<li {% if block('page') == 'register' %}class="active"{% endif %}><a href="{{ langPrefix }}/{{ event.webname }}/register">{{ i18n('common.nav-register') }}</a></li>
111111
{% endif %}
112112
{% endif %}
113-
{% set skipSponsor = false %}
114-
{% set skipVolunteer = false %}
115113
{% for link in event.special_links %}
116114
{% if link.location == 'header' %}
117-
{% if link.name == 'Sponsor' %}
118-
{% set skipSponsor = true %}
119-
{% elseif link.name == 'Volunteer' %}
120-
{% set skipVolunteer = true %}
121-
{% endif %}
122115
<li><a href="{{ link.url }}"{% if link.new_window %} target="_blank"{% endif %}>{{ link.name }}</a></li>
123116
{% endif %}
124117
{% endfor %}
125-
{% if not skipVolunteer %}
126-
<li {%if block('section') == 'volunteer' %}class="active"{% endif %}><a href="{{ langPrefix }}/volunteer">{{ i18n('common.nav-volunteer') }}</a></li>
127-
{% endif %}
128-
{% if not skipSponsor %}
129-
<li {% if block('section') == 'sponsor' %}class="active"{% endif %}><a href="{{ langPrefix }}/sponsor">{{ i18n('common.nav-sponsor') }}</a></li>
130-
{% endif %}
118+
<li><a href="{{ langPrefix }}/{{ event.webname }}/schools">{{ i18n('common.nav-schools') }}</a></li>
131119
<li><a href="{{ langPrefix }}/press" target="_blank">{{ i18n('common.nav-press') }}</a></li>
132120
{% if not event %}
133121
<li><a href="https://srnd.org/donate" target="_blank">{{ i18n('common.nav-donate') }}</a></li>

0 commit comments

Comments
 (0)