Skip to content

Commit

Permalink
add bootstraps styles
Browse files Browse the repository at this point in the history
  • Loading branch information
waalbert committed Apr 24, 2024
1 parent b2c30f5 commit 687ccfd
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 20 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 11 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/app/(main)/(home)/Home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
39 changes: 20 additions & 19 deletions src/app/layout.jsx
Original file line number Diff line number Diff line change
@@ -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 }) => (
<html lang="en">
<body className={varela.className}>{children}</body>
</html>
<html lang="en">
<body className={varela.className}>{children}</body>
</html>
);

export default RootLayout;
15 changes: 15 additions & 0 deletions src/app/lib/styles/_bootstrap-utils.scss
Original file line number Diff line number Diff line change
@@ -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";
25 changes: 25 additions & 0 deletions src/app/lib/styles/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -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";

0 comments on commit 687ccfd

Please sign in to comment.