Page MenuHomePhabricator
Files F3267962

D6015.diff
No OneTemporary
Actions

D6015.diff
View Options

diff --git a/landing/global.css b/landing/global.css
--- a/landing/global.css
+++ b/landing/global.css
@@ -12,25 +12,6 @@
}
/* ===== GENERAL PAGE STYLES ===== */
-html {
- background: radial-gradient(ellipse at bottom, #1f252e, #111827) fixed;
- font-family: var(--sans-serif);
- -moz-osx-font-smoothing: grayscale;
- text-rendering: optimizeLegibility;
- color: white;
- word-break: break-word;
-}
-
-/* Override browser default to achieve edge-to-edge footer translucency effect */
-body {
- background-image: radial-gradient(
- circle at top left,
- #2d008888 0%,
- #ffffff00 50%
- );
- margin: 0;
- padding: 0;
-}
html,
body,
diff --git a/landing/landing.css b/landing/landing.css
--- a/landing/landing.css
+++ b/landing/landing.css
@@ -1,3 +1,27 @@
+.container {
+ background: radial-gradient(ellipse at bottom, #1f252e, #111827) fixed;
+ font-family: var(--sans-serif);
+ -moz-osx-font-smoothing: grayscale;
+ text-rendering: optimizeLegibility;
+ color: white;
+ word-break: break-word;
+ height: 100%;
+ position: relative;
+ z-index: 0;
+}
+
+.innerContainer {
+ background-image: radial-gradient(
+ circle at top left,
+ #2d008888 0%,
+ #ffffff00 50%
+ );
+ margin: 0;
+ padding: 0;
+ height: 100%;
+ overflow: auto;
+}
+
.wrapper {
transition-property: max-width;
transition: 300ms;
diff --git a/landing/landing.react.js b/landing/landing.react.js
--- a/landing/landing.react.js
+++ b/landing/landing.react.js
@@ -13,6 +13,7 @@
import Header from './header.react';
import Investors from './investors.react';
import Keyservers from './keyservers.react';
+import css from './landing.css';
import Privacy from './privacy.react';
import QR from './qr.react';
import SIWE from './siwe.react';
@@ -24,6 +25,18 @@
import './global.css';
function Landing(): React.Node {
+ const onSIWE = useRouteMatch({ path: '/siwe' });
+ if (onSIWE) {
+ return <SIWE />;
+ }
+ return (
+ <ModalProvider>
+ <LandingSite />
+ </ModalProvider>
+ );
+}
+
+function LandingSite(): React.Node {
const modalContext = useModalContext();
const modals = React.useMemo(
@@ -42,7 +55,6 @@
const onQR = useRouteMatch({ path: '/qr' });
const onTeam = useRouteMatch({ path: '/team' });
const onInvestors = useRouteMatch({ path: '/investors' });
- const onSIWE = useRouteMatch({ path: '/siwe' });
const activePage = React.useMemo(() => {
if (onPrivacy) {
@@ -55,8 +67,6 @@
return <Keyservers />;
} else if (onQR) {
return <QR />;
- } else if (onSIWE) {
- return <SIWE />;
} else if (onTeam) {
return <Team />;
} else if (onInvestors) {
@@ -64,43 +74,28 @@
} else {
return <AppLanding />;
}
- }, [
- onKeyservers,
- onPrivacy,
- onSupport,
- onTerms,
- onTeam,
- onInvestors,
- onQR,
- onSIWE,
- ]);
+ }, [onKeyservers, onPrivacy, onSupport, onTerms, onTeam, onInvestors, onQR]);
let header = <Header />;
- if (onQR || onSIWE) {
+ if (onQR) {
header = null;
}
let footer = <Footer />;
- if (onQR || onSIWE) {
+ if (onQR) {
footer = null;
}
return (
- <>
- {header}
- {activePage}
- {footer}
- {modals}
- </>
- );
-}
-
-function LandingWithProvider(): React.Node {
- return (
- <ModalProvider>
- <Landing />
- </ModalProvider>
+ <div className={css.container}>
+ <div className={css.innerContainer}>
+ {header}
+ {activePage}
+ {footer}
+ {modals}
+ </div>
+ </div>
);
}
-export default LandingWithProvider;
+export default Landing;

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 3:06 AM (17 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2511644
Default Alt Text
D6015.diff (3 KB)

Event Timeline