diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss similarity index 95% rename from src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss rename to src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 4bb1204a4..bd67b58ca 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -1,4 +1,4 @@ -@import '~ChillMainAssets/modules/bootstrap/bootstrap'; +@import '~ChillMainAssets/module/bootstrap/bootstrap'; //@import '~ChillMainSass/custom/mixins/entity'; //.chill-entity.chill-entity__activity-reason { @@ -71,7 +71,7 @@ div.flex-table.list-records { &:nth-child(2) { flex-grow: 0; flex-shrink: 1; flex-basis: 70%; } - + &:only-child { flex-grow: 0; flex-shrink: 0; flex-basis: 100%; & > div.concerned-groups { @@ -80,11 +80,11 @@ div.flex-table.list-records { flex-direction: column; // TODO pas fini div.group { flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - h4 {} + h4 {} ul.list-content { - li { + li { display: inline; - } + } } } } diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js new file mode 100644 index 000000000..3028d6f5c --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js @@ -0,0 +1 @@ +require('./chillactivity.scss'); diff --git a/src/Bundle/ChillActivityBundle/Resources/public/index.js b/src/Bundle/ChillActivityBundle/Resources/public/index.js deleted file mode 100644 index e219e368b..000000000 --- a/src/Bundle/ChillActivityBundle/Resources/public/index.js +++ /dev/null @@ -1 +0,0 @@ -require('./scss/chillactivity.scss'); diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig index 6160f652e..f6ffa2b66 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig @@ -6,20 +6,16 @@ {% block content %}