Commit 910a1bfc authored by Luzian Bieri's avatar Luzian Bieri
Browse files

Fixed scrolling error

parent 146e1516
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
"events.registration_starts_at": "Das Anmeldefenster öffnet am %{time}", "events.registration_starts_at": "Das Anmeldefenster öffnet am %{time}",
"events.%n_spots_available": [ "events.%n_spots_available": [
[-100, -1, "Plätze verfügbar"], [-100, -1, "Plätze verfügbar"],
[0, 0, "Keine Plätze verfügbar, du landest auf der Wartelist"], [0, 0, "Keine Plätze verfügbar, du landest auf der Warteliste."],
[1, 1, "%n Platz verfügbar"], [1, 1, "%n Platz verfügbar"],
[2, null, "%n Plätze verfügbar"] [2, null, "%n Plätze verfügbar"]
], ],
......
.event-details { .event-details {
width: 30vw; width: 30vw;
padding: 2vmin; padding: 2vmin 4vmin 8vmin 2vmin;
height: calc(100% - 10vmin);
.title{ .title {
font-weight: 100; font-weight: 100;
font-size: 6vmin; font-size: 200%;
color: #004398; color: #004398;
} }
.date {
font-weight: 100;
font-size: 100%;
}
.price {
font-weight: 100;
font-size: 100%;
}
.spots {
margin: 2% 0 2% 0;
font-weight: 600;
font-size: 80%;
}
p {
color: rgb(107, 108, 119);
}
button { button {
margin-right: 1em; margin-right: 1em;
} }
......
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
.grid-container { .grid-container {
width: 100%; width: 100%;
padding: 2vmin 2vmin; padding: 2vmin;
display: grid; display: grid;
grid-gap: 0; grid-gap: 0;
grid-template-columns: auto 40vmin; grid-template-columns: 55% 45%;
grid-template-rows: 50% 25% 25%; grid-template-rows: 50% 50%;
.title { .title {
margin: 0 0 1.5vmin 0; margin: 0 0 1.5vmin;
display: flex; display: flex;
font-weight: 100; font-weight: 100;
font-size: 6vmin; font-size: 150%;
color: #004398; color: #004398;
grid-column: 1 / span 2; grid-column: 1 / span 2;
grid-row: 1; grid-row: 1;
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.price { .price {
margin: 0; margin: 0;
font-size: 4vmin; font-size: 100%;
font-weight: 100; font-weight: 100;
color: rgb(107, 108, 119); color: rgb(107, 108, 119);
grid-column: 1; grid-column: 1;
...@@ -36,15 +36,13 @@ ...@@ -36,15 +36,13 @@
.date-container { .date-container {
margin: 0; margin: 0;
font-weight: 100;
color: rgb(28, 34, 105);
grid-column: 2; grid-column: 2;
grid-row: 2; grid-row: 2;
} }
.weekday { .weekday {
margin: 0; margin: 0;
font-size: 4vmin; font-size: 100%;
font-weight: 100; font-weight: 100;
grid-column: 1; grid-column: 1;
color: rgb(107, 108, 119); color: rgb(107, 108, 119);
...@@ -52,7 +50,7 @@ ...@@ -52,7 +50,7 @@
.date { .date {
margin: 0; margin: 0;
font-size: 3vmin; font-size: 75%;
font-weight: 100; font-weight: 100;
grid-column: 2; grid-column: 2;
color: rgb(107, 108, 119); color: rgb(107, 108, 119);
......
...@@ -190,6 +190,8 @@ ...@@ -190,6 +190,8 @@
} }
.details { .details {
overflow-y: auto;
overflow-x: hidden;
@media @tablet { @media @tablet {
grid-column: ~'1 / 3'; grid-column: ~'1 / 3';
} }
......
...@@ -175,10 +175,10 @@ export default class EventDetails { ...@@ -175,10 +175,10 @@ export default class EventDetails {
return m('div.event-details', [ return m('div.event-details', [
m('div', {class: 'title'}, event.getTitle()), m('div', {class: 'title'}, event.getTitle()),
m('div', day + time + ' '+ i18n('date.oclock', )), m('div', {class: 'date'}, day + time + ' '+ i18n('date.oclock', )),
m('div', i18n('events.price', ) + ': ' + price), m('div', {class: 'price'}, i18n('events.price', ) + ': ' + price),
m( m(
'div', 'div', {class: 'spots'},
event.spots === undefined event.spots === undefined
? i18n('events.no_registration') ? i18n('events.no_registration')
: i18n('events.%n_spots_available', event.spots == 0 ? -1 : (event.spots - event.signup_count) < 0 ? 0 : (event.spots - event.signup_count)) : i18n('events.%n_spots_available', event.spots == 0 ? -1 : (event.spots - event.signup_count) < 0 ? 0 : (event.spots - event.signup_count))
...@@ -186,5 +186,5 @@ export default class EventDetails { ...@@ -186,5 +186,5 @@ export default class EventDetails {
m('p', m.trust(marked(escape(event.getDescription())))), m('p', m.trust(marked(escape(event.getDescription())))),
eventSignupForm, eventSignupForm,
]); ]);
} }// maybe use catchphrase in list view
} }
Supports Markdown
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