Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Conflict resolved after rebase

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-13 19:16:53 +01:00
commit 8c14232a91
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,19 +120,12 @@ ul.columns { // XS:1 SM:2 MD:1 LG:2 XL:2 XXL:2
} }
} }
/// badge_title in AccompanyingCourse Work list Page
h2.badge-title {
/// dashboard_like_badge in AccompanyingCourse Work list Page span.title_label {
// div.accompanying_course_work-list { // Calculate same color then border:groove
div.dashboard, background-color: shade-color($social-action-color, 34%);
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);
}
} }
span.title_action { span.title_action {
@include badge_social($social-action-color); @include badge_social($social-action-color);

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

@ -327,6 +327,7 @@ export default {
AddPersons, AddPersons,
PersonRenderBox, PersonRenderBox,
AddressRenderBox, AddressRenderBox,
ThirdPartyRenderBox,
PickTemplate, PickTemplate,
ThirdPartyRenderBox, ThirdPartyRenderBox,
OnTheFly OnTheFly