Merge branch 'upgrade-sf3' of framagit.org:Chill-project/Chill-Person into upgrade-sf3

merge for adding missing webpack config file for person bundle
This commit is contained in:
nobohan 2018-04-27 14:35:15 +02:00
commit 46eb6d1710

View File

@ -1,5 +1,5 @@
@import '../../../../main/Resources/public/sass/config/colors'; @import '../../../../main/Resources/public/sass/custom/config/colors';
div#header-person-name { div#header-person-name {
background: none repeat scroll 0 0 $chill-green-dark; background: none repeat scroll 0 0 $chill-green-dark;
@ -54,35 +54,35 @@ div.person-view {
figure.person-details { figure.person-details {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
div.cf_title_box:nth-child(4n+1) h2 { div.cf_title_box:nth-child(4n+1) h2 {
@extend .chill-red; @extend .chill-red;
} }
div.cf_title_box:nth-child(4n+2) h2 { div.cf_title_box:nth-child(4n+2) h2 {
@extend .chill-green; @extend .chill-green;
} }
div.cf_title_box:nth-child(4n+3) h2 { div.cf_title_box:nth-child(4n+3) h2 {
@extend .chill-orange; @extend .chill-orange;
} }
div.cf_title_box:nth-child(4n+4) h2 { div.cf_title_box:nth-child(4n+4) h2 {
@extend .chill-blue; @extend .chill-blue;
} }
div.cf_title_box:nth-child(2n+1){ div.cf_title_box:nth-child(2n+1){
width: 50%; width: 50%;
margin-right: 40px; margin-right: 40px;
} }
iv.cf_title_box:nth-child(2n+2) { iv.cf_title_box:nth-child(2n+2) {
width: calc(50% - 40px); width: calc(50% - 40px);
} }
} }
} }
} }