diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss index 5a7c084a8..5ea6f3fff 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss @@ -5,6 +5,7 @@ &:before { font: normal normal normal 14px/1 ForkAwesome; margin-left: 0.5em; + margin-right: 0.5rem; content: "\f00d"; // fa-times color: var(--bs-danger); text-decoration: none; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index a5735892b..f19bbd466 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -53,8 +53,8 @@
- {{ g.goal.title.fr }} + {{ g.goal.title.fr }}
@@ -63,7 +63,7 @@
-
+
+
empty for results
+
--> +
+
+

+ + + + + +

+
+ + + +
+

+ Aucun objectif associƩ +

+
+
+ {{ $t('no_goals_available') }} +
@@ -321,6 +364,7 @@ export default { i18n, data() { return { + isExpanded: false, editor: ClassicEditor, showAddObjective: false, showAddEvaluation: false, @@ -410,8 +454,8 @@ export default { }, }, methods: { - toggleAddObjective() { - this.showAddObjective = !this.showAddObjective; + toggleSelect() { + this.isExpanded = !this.isExpanded; }, addGoal(g) { @@ -607,4 +651,16 @@ div#workEditor { } } +.accordion-item:first-of-type, .accordion-item:last-of-type { + border-radius: 0rem; + border: 0px; + .accordion-button { + padding: .25rem; + border: 1px solid rgba(17, 17, 17, 0.125); + margin-top: 20px; + margin-bottom: 20px; + } +} + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue index 0759a95f0..9cbc0db84 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue @@ -8,8 +8,8 @@