Skip to content

Commit 3b263f9

Browse files
authored
fix: migrate site component from scss to tailwind (#8071)
1 parent 30d6c56 commit 3b263f9

4 files changed

Lines changed: 10 additions & 46 deletions

File tree

src/components/Footer/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const footerLinkClasses =
99
"text-[11px] uppercase text-[#777676] hover:text-[#333333]";
1010

1111
const Footer = () => (
12-
<footer className="w-full flex-[0_0_auto]">
12+
<footer className="w-full flex-[0_0_auto] print:hidden">
1313
<Container className="mx-auto max-w-[900px] px-5 pb-[30px] pt-[40px] text-center [&_a]:text-[#3b7eb5]">
1414
<div className="mb-[24px] flex justify-center">
1515
<a href="https://openjsf.org" target="_blank" rel="noopener noreferrer">

src/components/Navigation/Navigation.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function Navigation({ links, pathname, hash = "", toggleSidebar }) {
128128

129129
return (
130130
<>
131-
<header className="bg-blue-800 dark:bg-gray-900">
131+
<header className="bg-blue-800 dark:bg-gray-900 print:hidden">
132132
<div className="flex items-center py-10 px-[16px] justify-between md:px-[24px] md:max-w-[1024px] md:mx-auto md:justify-start">
133133
<button
134134
aria-label="Toggle navigation menu"

src/components/Site/Site.jsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import Sponsors from "../Sponsors/Sponsors.jsx";
4141

4242
// Load Styling
4343
import "../../styles/index.scss";
44-
import "./Site.scss";
4544

4645
// Load Content Tree
4746

@@ -217,7 +216,7 @@ function Site(props) {
217216
}, [location, navigate]);
218217

219218
return (
220-
<div className="site">
219+
<div className="flex flex-col min-h-screen bg-white dark:bg-gray-900">
221220
<Helmet>
222221
<html lang="en" />
223222
<meta charset="utf-8" />
@@ -271,7 +270,7 @@ function Site(props) {
271270
<meta name="msapplication-TileImage" content="/icon_150x150.png" />
272271
<meta name="msapplication-TileColor" content="#465e69" />
273272
</Helmet>
274-
<div className="site__header">
273+
<div className="z-[100] fixed w-full">
275274
<OfflineBanner />
276275
<Navigation
277276
pathname={location.pathname}
@@ -315,9 +314,11 @@ function Site(props) {
315314
<Route index element={<Splash />} />
316315
<Route
317316
element={
318-
<Container className="site__content">
319-
<Outlet />
320-
</Container>
317+
<div className="flex-[1_1_auto] relative mt-[110px] print:mt-0">
318+
<Container className="flex">
319+
<Outlet />
320+
</Container>
321+
</div>
321322
}
322323
>
323324
<Route path="app-shell" element={<Fragment />} />
@@ -368,7 +369,7 @@ function PageElement(props) {
368369
<Fragment>
369370
<Sponsors />
370371
<Sidebar
371-
className="site__sidebar"
372+
className="flex-[0_0_280px]"
372373
currentPage={currentPage}
373374
pages={sidebarPages}
374375
/>

src/components/Site/Site.scss

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)