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

apply epfl styles #122

Closed
wants to merge 4 commits into from
Closed
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 web/frontend/src/assets/epfl-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions web/frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
font-family: Arial, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
font-family: Arial, source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
2 changes: 1 addition & 1 deletion web/frontend/src/layout/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.App {
font-family: sans-serif;
font-family: Arial;
color: rgb(71, 71, 71);
background-color: white;
position: relative;
Expand Down
17 changes: 0 additions & 17 deletions web/frontend/src/layout/Header.tsx

This file was deleted.

5 changes: 5 additions & 0 deletions web/frontend/src/layout/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { availableLanguages } from 'language/Configuration';
import { LanguageSelector } from '../language';

import logo from '../assets/logo.png';
import { ReactComponent as EPFL_LOGO } from '../assets/epfl-logo.svg';
import { Popover, Transition } from '@headlessui/react';
import { LoginIcon, LogoutIcon, MenuIcon, XIcon } from '@heroicons/react/outline';
import { PlusIcon } from '@heroicons/react/solid';
Expand Down Expand Up @@ -178,6 +179,10 @@ const RightSideNavBar = ({ authCtx, handleLogout, handleChangeId, fctx, t }) =>
const LeftSideNavBar = ({ authCtx, t }) => (
<div className="flex-1 flex items-center justify-center md:justify-start">
<div data-testid="leftSideNavBarLogo" className="flex-shrink-0 flex items-center">
<NavLink to={ROUTE_HOME}>
<EPFL_LOGO className="h-8 w-auto" />
</NavLink>
<div className="mx-4 text-gray-500">|</div>
<NavLink to={ROUTE_HOME}>
<img className="hidden lg:block h-10 w-auto" src={logo} alt="Workflow" />
</NavLink>
Expand Down
Loading