mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 13:54:23 +00:00
Merge remote-tracking branch 'origin/upgrade-sf3' into upgrade-sf3
This commit is contained in:
commit
569befbb2d
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
4
chill.webpack.config.js
Normal file
4
chill.webpack.config.js
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
// this file loads all assets from the Chill person bundle
|
||||||
|
|
||||||
|
require('./Resources/public/css/person.css');
|
||||||
|
//require('./Resources/public/sass/person.scss');
|
Loading…
x
Reference in New Issue
Block a user