Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Bootstrap Styles #259

Closed
wants to merge 1 commit into from
+72 −20
Closed

Add Bootstrap Styles #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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";