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

Bootstrap Sass Organization #17

Merged
merged 11 commits into from
Sep 11, 2023
Merged

Bootstrap Sass Organization #17

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e11fc8e
feat: bootstrap sass organization
samderanova Sep 6, 2023
fa0fb83
fix: installed bootstrap
samderanova Sep 6, 2023
6edd034
fix: import font from Next instead of Google Fonts
samderanova Sep 6, 2023
bfe6a22
fix: update red hex value correctly
tyleryy Sep 7, 2023
98c7729
linting
tyleryy Sep 7, 2023
20cc9de
fix: custom CSS property for font
samderanova Sep 8, 2023
290e561
Merge branch 'feature/bootstrap-sass-organization' of https://github.…
samderanova Sep 8, 2023
146f9f2
fix: sass partials
samderanova Sep 8, 2023
5d6d7de
Merge branch 'main' of https://github.com/HackAtUCI/zothacks-site-202…
samderanova Sep 9, 2023
ecfd955
fix: new sass path, incorporated navbar and footer
samderanova Sep 9, 2023
24bc9d9
fix: removed comment
tyleryy Sep 10, 2023
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
2 changes: 1 addition & 1 deletion apps/sanity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
"prettier": "^2.8.8",
"typescript": "^4.9.5"
}
}
}
1 change: 1 addition & 0 deletions apps/site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@types/node": "20.4.9",
"@types/react": "18.2.20",
"@types/react-dom": "^18.2.0",
"bootstrap": "^5.3.1",
"eslint": "8.46.0",
"eslint-config-next": "^13.4.1",
"next": "^13.4.1",
Expand Down
10 changes: 0 additions & 10 deletions apps/site/src/app/globals.scss
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions apps/site/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import "./globals.scss";
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import { Fuzzy_Bubbles } from "next/font/google";

const inter = Inter({ subsets: ["latin"] });
import "@/lib/styles/bootstrap.scss";

const fuzzy = Fuzzy_Bubbles({ weight: ["400", "700"], subsets: ["latin"] });

export const metadata: Metadata = {
title: "Create Next App",
Expand All @@ -16,7 +17,7 @@ export default function RootLayout({
}) {
return (
<html lang="en">
<body className={inter.className}>{children}</body>
<body className={fuzzy.className}>{children}</body>
</html>
);
}
Empty file removed apps/site/src/app/page.module.scss
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion apps/site/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { Landing as default } from "@/views";
export { Landing as default } from "@/views";
2 changes: 1 addition & 1 deletion apps/site/src/app/resources/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { Resources as default } from "@/views";
export { Resources as default } from "@/views";
2 changes: 1 addition & 1 deletion apps/site/src/app/schedule/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { Schedule as default } from "@/views";
export { Schedule as default } from "@/views";
8 changes: 8 additions & 0 deletions apps/site/src/lib/styles/bootstrap-utils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import "./zothacks-theme.scss";

@import "~bootstrap/scss/functions";
@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 apps/site/src/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.scss";

/* 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";
7 changes: 6 additions & 1 deletion apps/site/src/lib/styles/variables.scss → apps/site/src/lib/styles/zothacks-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $white: #fafaff; // Paper Background color
$beige: #faf4ea;
$black: #21242d; // Text color
$silver: #e6f2fc; // Line pattern color of paper
$red: #e2b7f7; // ! hex value doesn't match with Figma design
$red: #ff3750; // ! hex value doesn't match with Figma design
$pink: #ffa8c3;
$orange: #ff5c00;
$gold: #ffd600; // accent colors
Expand All @@ -17,3 +17,8 @@ $purple: #6600b6;

// fonts
$fuzzy-bubbles: "Fuzzy Bubbles", cursive;

// bootstrap overrides
$font-family-base: $fuzzy-bubbles;
samderanova marked this conversation as resolved.
Show resolved Hide resolved
$font-size-base: 1.25rem;
$headings-font-weight: 700;
2 changes: 1 addition & 1 deletion apps/site/src/views/Landing/Landing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export default function Landing() {
<h1>ZotHacks 2023</h1>
</main>
);
}
}
4 changes: 2 additions & 2 deletions apps/site/src/views/Resources/Resources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "./Resources.module.scss";

export default function Resources() {
return <h1>Resources</h1>
}
return <h1>Resources</h1>;
}
2 changes: 1 addition & 1 deletion apps/site/src/views/Schedule/Schedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "./Schedule.module.scss";

export default function Schedule() {
return <h1>Schedule</h1>
return <h1>Schedule</h1>;
}
2 changes: 1 addition & 1 deletion apps/site/src/views/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { default as Landing } from "./Landing/Landing";
export { default as Resources } from "./Resources/Resources";
export { default as Schedule } from "./Schedule/Schedule";
export { default as Schedule } from "./Schedule/Schedule";
58 changes: 36 additions & 22 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.

Loading