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

Change eBL Logo, Add Akademie Logo #487

Merged
merged 4 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ The sitemap should be regularly updated. To do so, follow these steps:

## Acknowledgements

[Junicode](http://junicode.sourceforge.net/) webfont by [psb1558](http://sourceforge.net/users/psb1558) is licensed under the [SIL Open Font License, Version 1.1](http://scripts.sil.org/OFL). You can get the full distribution from [Junicode download page](http://sourceforge.net/projects/junicode/?source=typ_redirect).
[Junicode](https://github.com/psb1558/Junicode-font) webfont by [psb1558](https://github.com/psb1558) is licensed under the [SIL Open Font License, Version 1.1](http://scripts.sil.org/OFL). You can get the full distribution from [Junicode download page](https://github.com/psb1558/Junicode-font).
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line length


[Assurbanipal, Esagil, Santakku, SantakkuM, UllikummiA](https://www.hethport.uni-wuerzburg.de/cuneifont//) webfonts by
[Sylvie Vanséveren](https://www.hethport.uni-wuerzburg.de/cuneifont/) are freely available for the scientific community.
Expand Down
86 changes: 86 additions & 0 deletions src/BAdW_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 133 additions & 0 deletions src/BAdW_Logo_blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 23 additions & 11 deletions src/Header.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
.Header__corporate-logo {
height: 4em;
margin-bottom: 0.5rem;
.Header__badw-logo {
height: 1.7em;
}

.Header__lmu-logo {
height: 2em;
margin-bottom: 0.2em;
}

.Header__logo-container {
display: flex;
flex-direction: column;
text-align: center;
}

.Header__title {
font-size: 1em;
display: flex;
align-items: center;
}

.Header__title-main {
border-right: 0.05em solid black;
display: inline-block;
font-weight: bold;
line-height: 1.2;
margin-right: 0.5em;
padding-right: 0.5em;
text-align: right;
font-variant: unicase;
vertical-align: middle;
}

.Header__title-abbreviation {
color: white;
font-size: 4em;
line-height: 0.7;
text-shadow: -1.5px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black,
1px 1px 0 black;
font-size: 3em;
font-variant: unicase;
padding: 0 0.1em 0 0.1em;
background-color: #0077be;
vertical-align: middle;
margin-right: 0.2em;
}

#navbar-container {
Expand Down
36 changes: 31 additions & 5 deletions src/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import _ from 'lodash'
import User from './auth/User'
import './Header.css'
import lmuLogo from './LMU_Logo.svg'
import badwLogo from './BAdW_Logo.svg'
import ExternalLink from 'common/ExternalLink'

function EblLogo(): JSX.Element {
Expand Down Expand Up @@ -33,18 +34,40 @@ function NavItem(props: { href: string; title: string }): JSX.Element {
)
}

function LogoLink(props: {
href: string
className: string
src: string
}): JSX.Element {
return (
<ExternalLink href={props.href}>
<Image className={props.className} src={props.src} fluid />
</ExternalLink>
)
}

function LogoContainer(): JSX.Element {
const logos = [
{ href: 'https://www.lmu.de', className: 'Header__lmu-logo', src: lmuLogo },
{ href: 'https://badw.de/', className: 'Header__badw-logo', src: badwLogo },
]

return (
<Container className="Header__logo-container">
{logos.map((logo) => (
<LogoLink key={logo.href} {...logo} />
))}
</Container>
)
}

export default function Header(): JSX.Element {
const [activeKey, setActiveKey] = useState<string>()
const id = _.uniqueId('Header-')
return (
<header className="Header">
<Navbar variant="light" expand="md">
<Container>
<Navbar.Brand>
<ExternalLink href="https://www.lmu.de">
<Image className="Header__corporate-logo" src={lmuLogo} fluid />
</ExternalLink>
</Navbar.Brand>
<LinkContainer
to="/"
title="electronic Babylonian Library (eBL)"
Expand All @@ -54,6 +77,9 @@ export default function Header(): JSX.Element {
<EblLogo />
</Navbar.Brand>
</LinkContainer>
<Navbar.Brand>
<LogoContainer />
</Navbar.Brand>
<Navbar.Toggle aria-controls={id} />
<Navbar.Collapse id={id}>
<div
Expand Down
8 changes: 6 additions & 2 deletions src/Introduction.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@
.Introduction__footer {
margin-bottom: 1em;
margin-top: 1em;
margin-left: 10%;
margin-right: 10%;
text-align: center;
}

.BAdWIcon__image {
width: 350px;
}

.LMUIcon__image {
text-align: right;
width: 200px;
padding-right: 1em;
}

.HumboldtIcon__image {
text-align: left;
width: 200px;
padding-bottom: 1em;
}
Expand Down
Loading
Loading