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.

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

feat: navigator #2

Merged
merged 7 commits into from
Jan 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<meta name="twitter:image" content="https://defi.sucks/share.jpg">
<meta name="theme-color" content="#10152A">


<link rel="icon" type="image/svg+xml" href="/favicon.svg" />

<script src="/libs/blotter.min.js"></script>
Expand Down
19 changes: 13 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
import { BrowserRouter, Routes, Route } from "react-router-dom";

import { PageView, Navbar } from "@/components/app";
import { Lore } from "@/pages";
import { PageView } from "~/components/app";
import { Navbar } from "./containers";
import { Home, Lore } from "~/pages";
import Team from "./pages/Team";
import PortFolio from "./pages/Portfolio";
import ScrollToTop from "./hooks/ScrollToTop";

function App() {
return (
<PageView>
<BrowserRouter>
<Navbar />

<ScrollToTop />
<Routes>
<Route path="/" element={<Lore />} />
{/* <Route path="/" element={<Home />} /> */}
<Route path="*" element={<Navigate to="/" />} />
<Route path="*" element={<Home />}>
<Route path="lore" element={<Lore />} />
<Route path="team" element={<Team />} />
<Route path="portfolio" element={<PortFolio />} />
</Route>
</Routes>
</BrowserRouter>
</PageView>
Expand Down
Binary file added src/assets/Cono_bola.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 22 additions & 7 deletions src/assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
font-size: 73%;
font-size: 62.5%;
color-scheme: light dark;
font-synthesis: none;
text-rendering: optimizeLegibility;
Expand All @@ -17,7 +17,8 @@ body {
background-color: var(--background-surface-primary);
}

html, body {
html,
body {
margin: 0;
width: 100%;
height: 100%;
Expand All @@ -32,18 +33,28 @@ html, body {
box-sizing: border-box;
}

h1, h2, h3, h4, h5, h6, p {
h1,
h2,
h3,
h4,
h5,
h6,
p {
margin: 0;
font-weight: 500;
line-height: 1.25;
letter-spacing: .1rem;
letter-spacing: 0.1rem;
}

h1, h3, h5 {
h1,
h3,
h5 {
font-family: var(--font-medium);
}

h2, h4, h6 {
h2,
h4,
h6 {
font-family: var(--font-medium-l);
}

Expand All @@ -55,6 +66,10 @@ span {
letter-spacing: normal;
}

a {
text-decoration: none;
}

/* @media (prefers-color-scheme: light) {
:root {
color: #213547;
Expand All @@ -66,4 +81,4 @@ span {
button {
background-color: #f9f9f9;
}
} */
} */
6 changes: 3 additions & 3 deletions src/assets/css/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
--navbar-index: 1000;

/* GLOBAL VARS */
--page-max-width: 90rem;
--page-max-width: 120rem;

--navbar-height: 10.5rem;

--page-padding: 7.5rem;
--page-padding: 9rem;
}

@media screen and (max-width: 700px) {
Expand All @@ -26,4 +26,4 @@
:root {
--page-padding: 1rem;
}
}
}
3 changes: 3 additions & 0 deletions src/assets/footer_vector.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/lore_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/team_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
145 changes: 0 additions & 145 deletions src/components/app/Footer.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/app/HeroHeading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styled from "styled-components";
// import useFontFaceObserver from "use-font-face-observer";
import FontFaceObserver from "fontfaceobserver";

import { DisplayText } from "@/components/common";
import { DisplayText } from "~/components/common";

const MobileText = styled(DisplayText)`
font-size: 10vw;
Expand Down
97 changes: 0 additions & 97 deletions src/components/app/Navbar.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/app/PageContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const StyledPageContent = styled.section`
flex-direction: column;
align-items: center;
width: 100%;
padding-bottom: 10rem;
overflow: hidden;

@media screen and (max-width: 500px) {
Expand Down
Loading