Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/add_webpack' into upgrade-sf3

Browse Source 
merge webpack to upgrade_sf3
This commit is contained in:
nobohan 2018-04-27 11:08:45 +02:00
commit f7b061473b
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Resources/public/sass/person.scss
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 {
background: none repeat scroll 0 0 $chill-green-dark;
@ -54,35 +54,35 @@ div.person-view {
figure.person-details {
display: flex;
flex-flow: row wrap;
div.cf_title_box:nth-child(4n+1) h2 {
@extend .chill-red;
}
div.cf_title_box:nth-child(4n+2) h2 {
@extend .chill-green;
}
div.cf_title_box:nth-child(4n+3) h2 {
@extend .chill-orange;
}
div.cf_title_box:nth-child(4n+4) h2 {
@extend .chill-blue;
}
div.cf_title_box:nth-child(2n+1){
width: 50%;
margin-right: 40px;
}
iv.cf_title_box:nth-child(2n+2) {
width: calc(50% - 40px);
}
}
}
}

4
chill.webpack.config.js Normal file
View 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');