Merge branch 'master' into CRUD-init

This commit is contained in:
2019-12-04 21:50:21 +01:00
20 changed files with 263 additions and 17 deletions

View File

@@ -0,0 +1 @@
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">

View File

@@ -0,0 +1 @@
<img class="logo" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}">

View File

@@ -27,8 +27,8 @@
</head>
<body>
<div id="content">
<img class="logo" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}">
{{ include('@ChillMain/Login/_login-logo.html.twig') }}
{% if error is not null %}
<p>{{ error.message|trans }}</p>
{% endif %}

View File

@@ -37,7 +37,7 @@
<div class="grid-4 hide-tablet hide-mobile parent">
<div class="grid-10 push-2 grid-tablet-12 grid-mobile-12 push-tablet-0 grid-mobile-0 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
{{ include('@ChillMain/Layout/_header-logo.html.twig') }}
</a>
</div>
</div>