Merge pull request #1350 from greenpeace/planet-6034-fix

PLANET-6034 Disable Bootstrap 5 XXL breakpoint
greenpeace · Mar 31, 2021 · bc6717a · bc6717a
2 parents 1fe9a7f + d634228
commit bc6717a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/assets/src/scss/bootstrap-build.scss b/assets/src/scss/bootstrap-build.scss
@@ -18,6 +18,7 @@ Text Domain: planet4-master-theme
 
 // Configuration
 
+@import "vendors/bootstrap";
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
 @import "~bootstrap/scss/mixins";

diff --git a/assets/src/scss/pages/_page.scss b/assets/src/scss/pages/_page.scss
@@ -19,10 +19,6 @@ div.page-template {
     width: 1140px;
   }
 
-  @media (min-width: 1400px) {
-    width: 1320px;
-  }
-
   .container {
     padding-left: 0;
     padding-right: 0;

diff --git a/assets/src/scss/vendors/_bootstrap.scss b/assets/src/scss/vendors/_bootstrap.scss
@@ -0,0 +1,14 @@
+$grid-breakpoints: (
+  xs: 0,
+  sm: 576px,
+  md: 768px,
+  lg: 992px,
+  xl: 1200px
+);
+
+$container-max-widths: (
+  sm: 540px,
+  md: 720px,
+  lg: 960px,
+  xl: 1140px
+);