diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6d1208e9..65824436a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to
* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
* date versioning for test releases
+* [accompanyingCourse_work] fix styles conflicts
## Unreleased
diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index 717249a83..5b9da225e 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -397,7 +397,6 @@ Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'an
item
-
@@ -405,8 +404,8 @@ Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'an
Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
```html
- title
-
+ title
```
Les classes `cols` ou `inline` peuvent être ajoutées à côté de `list-suggest` pour modifier la disposition de la liste.
+Dans le dernier exemple, on met une classe `removable` sur le span, si on veut pouvoir enlever l'élément.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
index 4018e656b..4d213645e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
@@ -8,6 +8,10 @@
content: "\f00d"; // fa-times
color: var(--bs-danger);
text-decoration: none;
+ position: absolute;
+ display: block;
+ top: calc(50% - 7px);
+ right: 10px;
}
}
@@ -36,12 +40,24 @@ ul.list-suggest {
}
&.add-items {
li {
- cursor: pointer;
+ position: relative;
+ span {
+ cursor: pointer;
+ padding-left: 2rem;
+ }
& > span:before {
font: normal normal normal 14px/1 ForkAwesome;
margin-right: 0.5em;
content: "\f067"; // fa-plus
color: var(--bs-success);
+ position: absolute;
+ display: block;
+ top: 50%;
+ left: .75rem;
+ -webkit-transform: translateY(-50%);
+ -moz-transform: translateY(-50%);
+ -ms-transform: translateY(-50%);
+ transform: translateY(-50%);
}
& span:hover {
color: $chill-l-gray;
@@ -50,7 +66,10 @@ ul.list-suggest {
}
&.remove-items {
li {
- a {
+ position: relative;
+ span {
+ display: block;
+ padding-right: .75rem;
@include remove_link;
}
}
@@ -60,7 +79,14 @@ ul.list-suggest {
/// manage remove link if it isn't a list but a title
/// (cfr. in Vue AccompanyingCourseWorkEdit)
div.item-title {
- a {
- @include remove_link;
+ span {
+ display: block;
+ position: relative;
+ padding: 0.5em 0.8em;
+ background-color: $chill-llight-gray;
+ border-radius: .25rem;
+ &.removable {
+ @include remove_link;
+ }
}
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index da375f62e..da014255b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -52,7 +52,7 @@