diff --git a/Resources/public/css/chillevent.css b/Resources/public/css/chillevent.css new file mode 100644 index 000000000..fc2365989 --- /dev/null +++ b/Resources/public/css/chillevent.css @@ -0,0 +1,4 @@ +div#event_date { display: flex; flex-direction: row; flex-wrap: nowrap; } +div#event_date input#event_date_date { margin-right: 1em; } +div#event_date div#event_date_time { min-width: 140px; } + diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig index a85995ebb..2e46b56de 100644 --- a/Resources/views/Event/edit.html.twig +++ b/Resources/views/Event/edit.html.twig @@ -12,13 +12,6 @@ {{ form_row(edit_form.center) }} {% endif %} {{ form_row(edit_form.name) }} - - {# TODO temporaire: chaque fois qu'on a une date + une heure, on veut afficher sur une seule ligne #} - {{ form_row(edit_form.date) }} {{ form_row(edit_form.type, { 'label': 'Event type' }) }} diff --git a/Resources/views/Event/new.html.twig b/Resources/views/Event/new.html.twig index 478e54ffd..33ffe6893 100644 --- a/Resources/views/Event/new.html.twig +++ b/Resources/views/Event/new.html.twig @@ -10,13 +10,6 @@ {{ form_row(form.circle) }} {{ form_row(form.center) }} {{ form_row(form.name) }} - - {# TODO temporaire: chaque fois qu'on a une date + une heure, on veut afficher sur une seule ligne #} - {{ form_row(form.date) }} {{ form_row(form.type, { 'label': 'Event type' }) }} diff --git a/chill.webpack.config.js b/chill.webpack.config.js new file mode 100644 index 000000000..b7cd46970 --- /dev/null +++ b/chill.webpack.config.js @@ -0,0 +1,4 @@ +// this file loads all assets from the Chill event bundle + +// css +require('./Resources/public/css/chillevent.css');