Skip to content
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
2 changes: 1 addition & 1 deletion apps/roadmap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
"typecheck": "tsgo --noEmit"
},
"type": "module",
"version": "1.0.1"
"version": "1.0.2"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
114 changes: 114 additions & 0 deletions apps/roadmap/public/fonts/AtkinsonHyperlegibleNext.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-ExtraLight.woff2") format("woff2");
font-weight: 200;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-ExtraLightItalic.woff2") format("woff2");
font-weight: 200;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-Light.woff2") format("woff2");
font-weight: 300;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-LightItalic.woff2") format("woff2");
font-weight: 300;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-Regular.woff2") format("woff2");
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-RegularItalic.woff2") format("woff2");
font-weight: 400;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-Medium.woff2") format("woff2");
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-MediumItalic.woff2") format("woff2");
font-weight: 500;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-SemiBold.woff2") format("woff2");
font-weight: 600;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-SemiBoldItalic.woff2") format("woff2");
font-weight: 600;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-Bold.woff2") format("woff2");
font-weight: 700;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-BoldItalic.woff2") format("woff2");
font-weight: 700;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-ExtraBold.woff2") format("woff2");
font-weight: 800;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-ExtraBoldItalic.woff2") format("woff2");
font-weight: 800;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-Regular.woff2") format("woff2");
font-weight: 400;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Atkinson Hyperlegible Next";
src: url("./AtkinsonHyperlegibleNext-SemiBold.woff2") format("woff2");
font-weight: 600;
font-style: normal;
font-display: swap;
}
182 changes: 181 additions & 1 deletion apps/roadmap/public/themeEditor.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,161 @@
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-ExtraLight.woff2")
format("woff2");
font-weight: 200;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-ExtraLightItalic.woff2")
format("woff2");
font-weight: 200;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-Light.woff2")
format("woff2");
font-weight: 300;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-LightItalic.woff2")
format("woff2");
font-weight: 300;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-Regular.woff2")
format("woff2");
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-RegularItalic.woff2")
format("woff2");
font-weight: 400;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-Medium.woff2")
format("woff2");
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-MediumItalic.woff2")
format("woff2");
font-weight: 500;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-SemiBold.woff2")
format("woff2");
font-weight: 600;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-SemiBoldItalic.woff2")
format("woff2");
font-weight: 600;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-Bold.woff2")
format("woff2");
font-weight: 700;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-BoldItalic.woff2")
format("woff2");
font-weight: 700;
font-style: italic;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-ExtraBold.woff2")
format("woff2");
font-weight: 800;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "Atkinson Hyperlegible Next";
src:
local("Atkinson Hyperlegible Next"),
url("https://instructure.ai/roadmap/fonts/AtkinsonHyperlegibleNext-ExtraBoldItalic.woff2")
format("woff2");
font-weight: 800;
font-style: italic;
font-display: swap;
}

:root,
html,
body,
[class$="-view--block"],
h1,
h2,
h3,
h4,
h5,
h6,
span,
p,
div {
font-family:
"Atkinson Hyperlegible Next", "Helvetica Neue", Helvetica, Arial, sans-serif;
}

:root {
--v12-background-color: #f2f4f4;
}
Expand Down Expand Up @@ -38,6 +196,19 @@ body.primary-nav-expanded .ic-app-header {
border-radius: 1rem 1rem 0;
}

.ic-app-header__logomark {
border-radius: 1rem;
}

.ic-app-header__logomark:focus {
box-shadow: inset 0 0 0 0.125rem #6a7883;
}

.ic-app-header__logomark:hover,
.ic-app-header__logomark:focus {
background-color: rgba(0, 0, 0, 0.2);
}

.ic-app-header__menu-list {
padding-bottom: 0.5rem;
}
Expand All @@ -52,9 +223,18 @@ body.primary-nav-expanded .ic-app-header {
padding: 0.5625rem 0;
}

.ic-app-header__menu-list-link:focus {
box-shadow: inset 0 0 0 0.125rem #6a7883;
}

.ic-app-header__menu-list-item.ic-app-header__menu-list-item--active
.ic-app-header__menu-list-link {
background: #09508c;
background: #0c294a;
}

.ic-app-header__menu-list-item.ic-app-header__menu-list-item--active
.ic-app-header__menu-list-link:focus {
box-shadow: inset 0 0 0 0.125rem #103868;
}

.ic-app-header__menu-list-link.ic-app-header__menu-list-link--nav-toggle {
Expand Down
24 changes: 21 additions & 3 deletions apps/roadmap/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
sendHeight,
} from "./utils";
import "./App.css";
import "./assets/fonts/AtkinsonHyperlegibleNext.css";

const App: FC = () => {
const [overlayOpen, setOverlayOpen] = useState(false);
Expand Down Expand Up @@ -70,8 +71,25 @@ const App: FC = () => {
}));
}, [roadmap]);

// Debounce loading state
const [showLoading, setShowLoading] = useState(false);
useEffect(() => {
if (!roadmap) {
const timeout = setTimeout(() => setShowLoading(true), 1000);
return () => clearTimeout(timeout);
} else {
setShowLoading(false);
}
}, [roadmap]);

return (
<InstUISettingsProvider theme={{ ...canvas, ...(brandConfig as object) }}>
<InstUISettingsProvider
theme={{
...canvas,
...(brandConfig as object),
typography: { fontFamily: "Atkinson Hyperlegible Next, sans-serif" },
}}
>
{Entries.length ? (
<>
<Flex
Expand Down Expand Up @@ -99,9 +117,9 @@ const App: FC = () => {
/>
)}
</>
) : (
) : showLoading ? (
<Loading isDark={isDark} />
)}
) : null}
</InstUISettingsProvider>
);
};
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading