Merge branch 'fix-prototypage-details' into 'master'

Fix prototypage details

See merge request Chill-Projet/chill-bundles!94
This commit is contained in:
2021-06-29 15:06:20 +00:00
36 changed files with 1033 additions and 598 deletions

View File

@@ -43,6 +43,11 @@ final class ScopeRepository implements ObjectRepository
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
public function createQueryBuilder($alias, $indexBy = null)
{
return $this->repository->createQueryBuilder($alias, $indexBy);
}
public function getClassName() {
return Scope::class;

View File

@@ -45,33 +45,6 @@ table {
}
}
/*
* ACCOMPANYING_COURSE
* Header custom for Accompanying Course
*/
div#header-accompanying_course-name {
background: none repeat scroll 0 0 #718596;
color: #FFF;
h1 {
margin: 0.4em 0;
}
span {
a {
color: white;
}
a:hover {
text-decoration: underline;
}
}
}
div#header-accompanying_course-details {
background: none repeat scroll 0 0 #718596ab;
color: #FFF;
padding-top: 1em;
padding-bottom: 1em;
}
/*
* FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
*/
@@ -109,23 +82,13 @@ div.flex-bloc {
align-content: stretch;
div.item-bloc {
flex-grow: 0; flex-shrink: 1; flex-basis: 50%;
flex-grow: 0; flex-shrink: 1; flex-basis: 33%;
margin: 0;
padding: 1em;
border-top: 0;
&:nth-child(1), &:nth-child(2) {
border-top: 1px solid #000;
}
border-left: 0;
&:nth-child(odd) {
border-left: 1px solid #000;
}
//background-color: #e6e6e6;
display: flex;
flex-direction: column;
& > div.item-row {
div.item-row {
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex;
flex-direction: column;
@@ -158,12 +121,6 @@ div.flex-bloc {
@media only screen and (max-width: 900px) {
flex-direction: column;
margin: auto 0;
div.item-bloc {
border-left: 1px solid #000;
&:nth-child(2) {
border-top: 0;
}
}
}
}
@@ -232,8 +189,6 @@ div.flex-table {
}
}
/*
* Address form
*/
@@ -277,5 +232,3 @@ div.address_form {
}
}
}

View File

@@ -58,9 +58,9 @@ const messages = {
},
create: {
button: "Créer \"{q}\"",
title: "Créer à la volée…",
title: "Création d'un nouvel usager ou d'un tiers professionnel",
person: "un nouvel usager",
thirdparty: "un nouveau tiers"
thirdparty: "un nouveau tiers professionnel"
},
},
}

View File

@@ -56,7 +56,6 @@ module.exports = function(encore, entries)
// Chill2 new assets
encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
//encore.addEntry('vuejs', __dirname + '/Resources/public/modules/vue/index.js');
// CKEditor5
buildCKEditor(encore);