diff --git a/package.json b/package.json index 69cad4d..329b90a 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "@radix-ui/react-accordion": "^1.1.2", "@radix-ui/react-navigation-menu": "^1.1.4", + "bootstrap": "^5.3.3", "eslint": "^8.57.0", "lint-staged": "^15.2.2", "next": "^14.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48a686f..2c2aace 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ dependencies: '@radix-ui/react-navigation-menu': specifier: ^1.1.4 version: 1.1.4(react-dom@18.2.0)(react@18.2.0) + bootstrap: + specifier: ^5.3.3 + version: 5.3.3(@popperjs/core@2.11.8) eslint: specifier: ^8.57.0 version: 8.57.0 @@ -958,6 +961,14 @@ packages: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} + /bootstrap@5.3.3(@popperjs/core@2.11.8): + resolution: {integrity: sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==} + peerDependencies: + '@popperjs/core': ^2.11.8 + dependencies: + '@popperjs/core': 2.11.8 + dev: false + /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: diff --git a/src/app/(main)/(home)/Home.scss b/src/app/(main)/(home)/Home.scss index b5506a9..5102581 100644 --- a/src/app/(main)/(home)/Home.scss +++ b/src/app/(main)/(home)/Home.scss @@ -209,7 +209,6 @@ body { #apps { font-size: 24px; color: $darkPurple; - margin-bottom: 1.5rem; @media screen and (max-width: $break-medium) { font-size: 18px; } diff --git a/src/app/layout.jsx b/src/app/layout.jsx index 1cafb21..3a89903 100644 --- a/src/app/layout.jsx +++ b/src/app/layout.jsx @@ -1,31 +1,32 @@ import { varela } from "./fonts"; +import "@/app/lib/styles/bootstrap.scss"; export const metadata = { - title: { - default: "VenusHacks", - template: "%s | VenusHacks", - }, - description: "UC Irvine's women-centric hackathon", - openGraph: { - title: "VenusHacks", - description: "UC Irvine's women-centric hackathon", - url: "https://venushacks.com", - siteName: "VenusHacks", - locale: "en_US", - type: "website", - }, + title: { + default: "VenusHacks", + template: "%s | VenusHacks", + }, + description: "UC Irvine's women-centric hackathon", + openGraph: { + title: "VenusHacks", + description: "UC Irvine's women-centric hackathon", + url: "https://venushacks.com", + siteName: "VenusHacks", + locale: "en_US", + type: "website", + }, }; export const viewport = { - themeColor: "#000000", - width: "device-width", - initialScale: 1, + themeColor: "#000000", + width: "device-width", + initialScale: 1, }; const RootLayout = ({ children }) => ( - - {children} - + + {children} + ); export default RootLayout; diff --git a/src/app/lib/styles/_bootstrap-utils.scss b/src/app/lib/styles/_bootstrap-utils.scss new file mode 100644 index 0000000..e58fbb8 --- /dev/null +++ b/src/app/lib/styles/_bootstrap-utils.scss @@ -0,0 +1,15 @@ +@import "~bootstrap/scss/functions"; + +// Bootstrap overrides (must come before importing variables) +// $font-family-base: var(--next-font-fuzzy-bubbles); +// $font-size-base: 1.25rem; +// $h1-font-size: 5rem; +// $h2-font-size: 3rem; +// $headings-font-weight: 700; + +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/variables-dark"; + +@import "~bootstrap/scss/maps"; +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/utilities"; diff --git a/src/app/lib/styles/bootstrap.scss b/src/app/lib/styles/bootstrap.scss new file mode 100644 index 0000000..8d09653 --- /dev/null +++ b/src/app/lib/styles/bootstrap.scss @@ -0,0 +1,25 @@ +// Core configuration with overrides +@import "./bootstrap-utils"; + +/* Layout & components */ +@import "~bootstrap/scss/root"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/type"; + +@import "~bootstrap/scss/images"; +@import "~bootstrap/scss/containers"; +@import "~bootstrap/scss/grid"; + +/* Components */ +@import "~bootstrap/scss/buttons"; +@import "~bootstrap/scss/transitions"; +@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/navbar"; +@import "~bootstrap/scss/card"; +@import "~bootstrap/scss/accordion"; + +/* Helpers */ +@import "~bootstrap/scss/helpers"; + +/* Utilities */ +@import "~bootstrap/scss/utilities/api";