Commit 7f45f872 authored by gijs's avatar gijs

Merge branch 'contour' of gitlab.constantvzw.org:osp/tools.ethertoff into contour

parents 1dff71c8 5ae25ceb
......@@ -390,6 +390,7 @@ main {
* Todo: Multiple values through media queries?
*/
border-radius: 50%/3px;
vertical-align: middle;
}
......@@ -637,6 +638,9 @@ p, h4 {
.continuous {
display: block;
border: 2px solid black;
margin: 0 0.5em;
border-bottom: none;
}
.continuous .opening-times {
......@@ -654,8 +658,19 @@ p, h4 {
.continuous .continuous-event {
background: var(--blue-moon-light);
padding-bottom: 1em;
/* padding-bottom: 1em; */
border-bottom: 2px solid black;
}
.continuous-event .event-data::before {
content: url("/static/contour/images/small-loop.png");
vertical-align: text-top;
padding-right: px;
display: inline-block;
}
.continuous-event .event-data {
margin: 0 .75em 0 0em;
}
.loop-days .continuous .hour:before {
display: none;
......@@ -678,7 +693,10 @@ p, h4 {
}
.continuous .continuous-event figure {
margin-left: .5em;
/* margin-left: .5em; */
max-width: 1.6em;
margin: 5px 0 5px 0.5em;
display: inline-block;
}
}
......@@ -941,4 +959,4 @@ p, h4 {
.ps__rail-y.ps--clicking .ps__thumb-y {
background-color: #000000;
width: 11px;
}
\ No newline at end of file
}
......@@ -113,7 +113,9 @@ main {
#menu .logo img {
max-width: 100%;
}
img[alt="contour9-partners"] {
width: 100%;
}
#menu nav.language-switch {
flex: 0 0;
padding: 0;
......@@ -706,7 +708,6 @@ p, h4 {
#menu .logo img {
max-width: 190px;
}
#menu .toggle {
display: block;
flex: 1 0 auto;
......@@ -873,7 +874,7 @@ p, h4 {
.interbellum .day {
max-width: initial;
}
.loop .day .continuous-event {
display: flex;
flex-direction: row;
......@@ -884,11 +885,11 @@ p, h4 {
.continuous-event figure {
/* float: left; */
}
.continuous-event figure {
vertical-align: middle;
}
.continuous-event figure img {
max-height: 50px;
max-width: 100px !important;
......@@ -948,4 +949,4 @@ p, h4 {
.loop-day-date--inline {
top: 1.5em;
}
}
\ No newline at end of file
}
This diff is collapsed.
......@@ -58,7 +58,7 @@
<h3 class="loop-title"></h3>
<h3 class="day-date day-date--inline">{{ day.date|date:"D j M" }}</h3>
{% for event in day.events %}
<article class="event" data-pk="{{ event.pk }}" style="grid-row:{{ event.grid_coord }}">
<article class="event" data-pk="{{ event.pk }}" style="">
{% if event.project|cover_image %}
{% with event.project|cover_image as image %}
<figure class="preview">
......@@ -103,6 +103,7 @@
<section class="loop-days">
{% if loop.continuous %}
<section class="continuous">
<h3 class="loop-title">Continuous</h3>
<section class="opening-times">
<time class="hour">10:00 - 20:00</time>
<time class="hour">10:00 - 20:00</time>
......@@ -110,7 +111,7 @@
</section>
{% for event in loop.continuous %}
<article class="event continuous-event" data-pk="{{ event.pk }}">
{% if event.project|cover_image %}
{% with event.project|cover_image as image %}
<figure class="preview">
......@@ -133,7 +134,7 @@
</section>
{% endif %}
<section class="loop-days-wrapper">
{% for day in loop.days %}
<section class="day">
<h3 class="loop-day-date loop-day-date--inline">{{ day.date|date:"D j M" }}</h3>
......@@ -141,7 +142,7 @@
<section class="continuous-inline">
{% for event in loop.continuous %}
<article class="event continuous-event" data-pk="{{ event.pk }}">
{% if event.project|cover_image %}
{% with event.project|cover_image as image %}
<figure class="preview">
......@@ -170,7 +171,7 @@
{% endif %}
{% for event in day.events %}
<article class="event" data-pk="{{ event.pk }}" style="grid-row:{{ event.grid_coord }}">
<article class="event" data-pk="{{ event.pk }}" style="">
{% if event.project|cover_image %}
{% with event.project|cover_image as image %}
<figure class="preview">
......@@ -236,7 +237,7 @@
var menu = document.getElementById('menu');
menu.className = (menu.className == 'menu-active') ? '' : 'menu-active';
});
if (window.innerWidth < 600) {
document.querySelector('[data-focus]').scrollIntoView(true);
} else {
......@@ -257,4 +258,3 @@
<script src="{% static 'contour/js/eventHighlighter.js' %}"></script>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment