Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-01 14:36:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-09 13:49:22 +01:00
commit 9387d37746
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
View File

@ -115,23 +115,19 @@ ul.columns { // XS:1 SM:2 MD:1 LG:2 XL:2 XXL:2
}
}
/// badge_title in AccompanyingCourse Work list Page
/// dashboard_like_badge in AccompanyingCourse Work list Page
// div.accompanying_course_work-list {
div.dashboard,
h2.badge-title {
span.title_label {
// Calculate same color then border:groove
background-color: shade-color($social-action-color, 34%);
}
span.title_action {
@include dashboard_like_badge($social-action-color);
@include badge_title($social-action-color);
}
}
// }
/// dashboard_like_badge in Activities on resume page
/// badge_title in Activities on resume page
div.activity-list {
div.dashboard,
h2.badge-title {

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
View File

@ -256,6 +256,7 @@ import AddEvaluation from './components/AddEvaluation.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
@ -304,6 +305,7 @@ export default {
AddPersons,
PersonRenderBox,
AddressRenderBox,
ThirdPartyRenderBox,
PickTemplate,
ThirdPartyRenderBox,
},