From 4e9916534f308e2fe57c7a2eeeab0453aaeab7da Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 29 Jul 2021 10:45:11 +0200
Subject: [PATCH] every chill sass sheets need to load bootstrap configuration
 files

but we don't want to load all bootstrap in chill entrypoint !
---
 .../Resources/public/chill/chillactivity.scss      |  4 +++-
 .../Resources/public/chill/chillmain.scss          |  5 ++---
 .../public/module/bootstrap/bootstrap.scss         | 13 +++----------
 .../Resources/public/module/bootstrap/shared.scss  | 14 ++++++++++++++
 .../Resources/public/chill/chillperson.scss        |  3 ++-
 .../Resources/public/chill/chilltask.scss          |  3 ++-
 6 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index 3518d1751..1d271abfe 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -1,4 +1,6 @@
-@import '~ChillMainAssets/module/bootstrap/bootstrap';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
+
 //@import '~ChillMainSass/custom/mixins/entity';
 
 //.chill-entity.chill-entity__activity-reason {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 09f1ee84a..70c4d3c0f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -1,6 +1,5 @@
-// Need to access bootstrap variables
-// TO CHECK: load all bootstrap in chill entrypoint ??!
-@import '~ChillMainAssets/module/bootstrap/bootstrap';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
 // Chill mixins
 @import './scss/mixins';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss
index 19da697bd..cf36a9a54 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss
@@ -7,17 +7,10 @@
  * Enable / disable bootstrap assets
  */
 
+// Bootstrap configuration files are shared with chill entrypoint
+@import "shared";
+
 // scss-docs-start import-stack
-// Configuration
-@import "bootstrap/scss/functions";
-
-/* replace by CHILL variables */
-//@import "bootstrap/scss/variables";
-@import "custom/_variables";
-
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/utilities";
-
 // Layout & components
 @import "bootstrap/scss/root";
 @import "bootstrap/scss/reboot";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss
new file mode 100644
index 000000000..21e1ceca0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss
@@ -0,0 +1,14 @@
+// Configuration
+@import "bootstrap/scss/functions";
+
+/*
+*  Replaced by CHILL variables
+*  it is necessary to keep the possibility of making a diff with original !
+*  original: "bootstrap/scss/variables";
+*/
+@import "custom/_variables";
+
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/utilities";
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 9de18369a..774b76d1c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -1,4 +1,5 @@
-@import '~ChillMainAssets/module/bootstrap/bootstrap';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
 /*
 *  PERSON CONTEXT
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
index 69572c387..5aed9bc34 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss
@@ -1,4 +1,5 @@
-@import '~ChillMainAssets/module/bootstrap/bootstrap';
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
 
 div#single_task_warningInterval {
     display: flex;