2 files changed, 8 insertions, 16 deletions
diff --git a/addons/web/static/src/scss/import_bootstrap_part2.scss b/addons/web/static/src/scss/import_bootstrap.scss
index c15793019ad..d3d033a3575 100644
--- a/addons/web/static/src/scss/import_bootstrap_part2.scss
+++ b/addons/web/static/src/scss/import_bootstrap.scss
@@ -1,11 +1,14 @@
 
 // This file is importing bootstrap. While a simple "import "bootstrap";"
-// should be enough, this does not allow overridding mixins. Overridding mixins
-// is necessary for some of our need and allow to generate more efficient CSS
-// than adding more rules. This file instead copies the second part of the
-// content of the "bootstrap.scss" files to allow adding mixin overrides in
-// between.
+// should be enough, this does not allow overridding mixins/functions.
+// Overridding those is necessary for some of our need and allow to generate
+// more efficient CSS than adding more rules. This file instead copies the
+// content of the "bootstrap.scss" files but do not import functions, variables
+// and mixins which will be handled "by hand" in _assets_helpers.
 
+// @import "functions";
+// @import "variables";
+// @import "mixins";
 @import "root";
 @import "reboot";
 @import "type";
diff --git a/addons/web/static/src/scss/import_bootstrap_part1.scss b/addons/web/static/src/scss/import_bootstrap_part1.scss
deleted file mode 100644
index 09f4d3579ac..00000000000
--- a/addons/web/static/src/scss/import_bootstrap_part1.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-
-// This file is importing bootstrap. While a simple "import "bootstrap";"
-// should be enough, this does not allow overridding mixins. Overridding mixins
-// is necessary for some of our need and allow to generate more efficient CSS
-// than adding more rules. This file instead copies the first part of the
-// content of the "bootstrap.scss" files to allow adding mixin overrides in
-// between.
-
-@import "functions";
-@import "variables";
-@import "mixins";