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

feat(er-next): transfer colors & core styles + implement Navigation #1430

Merged
merged 14 commits into from Mar 7, 2024
Merged

feat(er-next): transfer colors & core styles + implement Navigation #1430

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ee9039d
login page: markup
DrShpongle Mar 6, 2024
7efa8bc
fix font weight import
DrShpongle Mar 6, 2024
507b774
tailwindcss config & global styles
DrShpongle Mar 6, 2024
9f4a243
login page: styles
DrShpongle Mar 6, 2024
e2d0006
clean up
DrShpongle Mar 6, 2024
41c7c0d
fix colors in tailwinfcss config
DrShpongle Mar 6, 2024
88ecc04
Logo component
DrShpongle Mar 6, 2024
39ed316
navigation: wip
DrShpongle Mar 7, 2024
e5066b1
tooltip for buttons
DrShpongle Mar 7, 2024
e9d17e0
Navigation completed (excluding Feedback component)
DrShpongle Mar 7, 2024
2b949e0
fix type
DrShpongle Mar 7, 2024
c33a7a7
css fixes
DrShpongle Mar 7, 2024
e77460e
banner on the Learn page
DrShpongle Mar 7, 2024
c646bfd
Merge branch 'main' into en/er-next-miscellaneous-stuff
kodiakhq[bot] Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added apps/epic-react/public/assets/flying-rocket-light-sm@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/flying-rocket-light-xl@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/flying-rocket-light@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/flying-rocket-sm@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/flying-rocket-xl@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/flying-rocket@2x.webp
View file
Open in desktop
Binary file not shown.
Binary file added apps/epic-react/public/assets/ring-planet-pattern@2x.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion apps/epic-react/src/components/app/layout.tsx
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ const inter = Inter({
subsets: ['latin'],
display: 'swap',
variable: '--font-sans',
weight: ['400', '600', '800'],
})

type LayoutProps = {
Expand Down Expand Up @@ -81,7 +82,7 @@ const Layout: FunctionComponent<React.PropsWithChildren<LayoutProps>> = ({
{withNavigation && <Navigation {...navigationProps} />}
<div
className={twMerge(
'flex h-full min-h-[calc(100svh-4rem)] flex-grow flex-col',
'mt-[61px] flex min-h-[calc(100svh-61px)] flex-grow flex-col',
className,
)}
>
Expand Down