diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss index 39dbb4e55..acf19205f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss @@ -162,6 +162,13 @@ div.activity-list { } /* +* Specific badge rounded-pill */ - +.badge { + &.bg-person { + //@extend .$chill-ll-gray; + background-color: $chill-ll-gray; + color: $chill-green; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index ab7074ffc..941836537 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -23,7 +23,7 @@ {{ person.id }} - {{ $t('renderbox.person') }} + {{ $t('renderbox.person') }} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss index 70c2bfccf..988426b19 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss @@ -1,21 +1,28 @@ @import 'ChillMainAssets/module/bootstrap/shared'; +/// Specific badge rounded-pill .badge { - &.bg-thirdparty-company { - //@extend .bg-info; - background-color: $yellow; - } + // Personne de contact &.bg-thirdparty-child { - //@extend .bg-chill-blue; - background-color: $chill-blue; + //@extend .$chill-ll-gray; + background-color: $chill-ll-gray; + color: $chill-pink; } + // Personne morale + &.bg-thirdparty-company { + //@extend .$chill-ll-gray; + background-color: $chill-ll-gray; + color: $chill-pink; + } + // Personne physique &.bg-thirdparty-contact { - //@extend .bg-secondary; - background-color: $secondary; + //@extend .$chill-ll-gray; + background-color: $chill-ll-gray; + color: $chill-pink; } } -/// +/// force first column width in list div.thirdparty-list { div.flex-table { div.item-bloc { diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue index 301007e75..11b78b507 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue @@ -7,24 +7,26 @@