From 5129d2cb5f6199039a9c45850231a089263f73c8 Mon Sep 17 00:00:00 2001 From: danieldeng2 <danieldeng223@gmail.com> Date: Tue, 11 Aug 2020 15:04:27 +0100 Subject: [PATCH] Comment out logic for custom breakpoints --- frontend/src/assets/scss/custom.scss | 9 ++------- frontend/src/components/pages/ModuleResources/index.tsx | 1 - .../components/pages/ModuleResources/style.module.scss | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/frontend/src/assets/scss/custom.scss b/frontend/src/assets/scss/custom.scss index c4dc6749e..ca99c8d62 100644 --- a/frontend/src/assets/scss/custom.scss +++ b/frontend/src/assets/scss/custom.scss @@ -1,14 +1,9 @@ // Override default variables before the import $nav-pills-link-active-color: black; -$container-max-widths: ( - sm: 540px, - md: 720px, - lg: 960px, - xl: 1140px, - xxl: 1400px -); +//* bootstrap 5's grid. To use, import the following line in the .module.scss */ +// @import "assets/scss/bootstrap5/bootstrap-grid"; $grid-breakpoints: ( xs: 0, sm: 576px, diff --git a/frontend/src/components/pages/ModuleResources/index.tsx b/frontend/src/components/pages/ModuleResources/index.tsx index 00c8b8a22..af5072ff7 100644 --- a/frontend/src/components/pages/ModuleResources/index.tsx +++ b/frontend/src/components/pages/ModuleResources/index.tsx @@ -70,7 +70,6 @@ const ModuleResources: React.FC = () => { lg={4} xl={3} key={i} - className={styles["col-xxl-2"]} style={{marginBottom: ".5rem"}} > <Card className={styles.quickViewCard}> diff --git a/frontend/src/components/pages/ModuleResources/style.module.scss b/frontend/src/components/pages/ModuleResources/style.module.scss index 0613406a5..4c5dd6dba 100644 --- a/frontend/src/components/pages/ModuleResources/style.module.scss +++ b/frontend/src/components/pages/ModuleResources/style.module.scss @@ -1,8 +1,5 @@ @import "assets/scss/custom"; -/* bootstrap 5's grid, delete if causes trouble */ -@import "assets/scss/bootstrap5/bootstrap-grid"; - .moduleParagraph { margin-top: 1rem; } -- GitLab