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

remove ChillMainSass webpack alias (scratch reference)

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-07-12 17:11:59 +02:00
parent 0224224744
commit 3c4c5e29a3
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
View File

@ -1,9 +1,9 @@
@import '~ChillMainSass/custom/config/colors';
@import '~ChillMainSass/custom/mixins/entity';
@import '~ChillMainAssets/modules/bootstrap/bootstrap';
//@import '~ChillMainSass/custom/mixins/entity';
.chill-entity.chill-entity__activity-reason {
@include entity($chill-pink, white);
}
//.chill-entity.chill-entity__activity-reason {
// @include entity($chill-pink, white);
//}
.activity {
color: $chill-green;

2
src/Bundle/ChillMainBundle/chill.webpack.config.js
View File

@ -45,7 +45,7 @@ module.exports = function(encore, entries)
// Aliases are used when webpack is trying to resolve modules path
encore.addAliases({
ChillMainAssets: __dirname + '/Resources/public',
ChillMainSass: __dirname + '/Resources/public/modules/scratch',
//ChillMainSass: __dirname + '/Resources/public/modules/scratch',
ShowHide: __dirname + '/Resources/public/modules/show_hide'
});

10
src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
View File

@ -1,4 +1,4 @@
@import '~ChillMainSass/custom/config/colors';
@import '~ChillMainAssets/modules/bootstrap/bootstrap';
/*
* PERSON CONTEXT
@ -51,16 +51,16 @@ div.person-view {
display: flex;
flex-flow: row wrap;
div.cf_title_box:nth-child(4n+1) h2 {
@extend .chill-red;
@extend .chill-red !optional;
}
div.cf_title_box:nth-child(4n+2) h2 {
@extend .chill-green;
@extend .chill-green !optional;
}
div.cf_title_box:nth-child(4n+3) h2 {
@extend .chill-orange;
@extend .chill-orange !optional;
}
div.cf_title_box:nth-child(4n+4) h2 {
@extend .chill-blue;
@extend .chill-blue !optional;
}
div.cf_title_box:nth-child(2n+1) {
width: 50%;

2
src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss
View File

@ -1,4 +1,4 @@
@import '~ChillMainSass/custom/config/colors';
@import '~ChillMainAssets/modules/bootstrap/bootstrap';
@import "_task-statuses.scss";
@import "_task-list.scss";