Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-02 21:13:57 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into CRUD-init

Browse Source
This commit is contained in:
Julien Fastré
2019-12-04 21:50:21 +01:00
parent 73bb897e61 e5aaa3a80b
commit 547439d9ef
20 changed files with 263 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/config/routing.yml
View File

@@ -35,7 +35,7 @@ root:
defaults:
_controller: FrameworkBundle:Redirect:urlRedirect
path: /homepage
permanent: true
permanent: false
chill_main_homepage_without_locale:
path: /homepage

6
Resources/config/services/phonenumber.yml
View File

@@ -4,6 +4,12 @@ services:
$logger: '@Psr\Log\LoggerInterface'
$config: '%chill_main.phone_helper%'
$cachePool: '@cache.user_data'
Chill\MainBundle\Phonenumber\Templating:
arguments:
$phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
tags:
- { name: twig.extension }
Chill\MainBundle\Validation\Validator\ValidPhonenumber:
arguments:

2
Resources/public/main.js
View File

@@ -27,8 +27,6 @@ require('./modules/download-report/index.js');
require('select2/dist/css/select2.css');
require('./modules/select_interactive_loading/index.js');
require('./modules/export-list/export-list.scss');
//import {ChillShowHide} from './modules/show_hide/index.js';
//global.ChillShowHide = ChillShowHide;
// img
require('./img/favicon.ico');

BIN
Resources/public/modules/login_page/desert.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 MiB

2
Resources/public/modules/login_page/login.scss
View File

@@ -28,7 +28,7 @@ body {
right: 0;
top: 0;
z-index: -1;
background-image: url('./../../img/background/desert.jpg');
background-image: url('./desert.jpg');
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;

1
Resources/views/Layout/_header-logo.html.twig Normal file
View File

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

1
Resources/views/Login/_login-logo.html.twig Normal file
View File

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

4
Resources/views/Login/login.html.twig
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 %}

2
Resources/views/layout.html.twig
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>