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

Add logos for Skosmos 3 #1562

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Add logos for Skosmos 3 #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d31d096
Add skosmos logos to headerbar and topbar
UnniKohonen Nov 23, 2023
9bc61b9
Fix logo width
UnniKohonen Nov 23, 2023
52ee826
Add .svg files
UnniKohonen Nov 23, 2023
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
20 changes: 20 additions & 0 deletions resource/css/skosmos.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,17 @@ body {
left: 205px;
}

#skosmos-logo-top {
background-image: url(../pics/skosmos-NEGA-RGB.svg);
background-repeat: no-repeat;
width: 140px;
height: 50px;
}

#skosmos-logo-top h2 {
text-indent: -100%;
}

.topbar-nav-link {
background-position: left center;
background-repeat: no-repeat;
Expand Down Expand Up @@ -199,6 +210,15 @@ body {
background-color: var(--headerbar-vocab-bg);
}

#skosmos-logo {
background-image: url(../pics/skosmos-RGB.svg);
background-repeat: no-repeat;
background-position: -20px -20px;
width: 400px;
height: 110px;
background-size: 400px;
}

#vocab-title a {
color: var(--headerbar-text-2);
font-family: var(--font-family-heading);
Expand Down
53 changes: 53 additions & 0 deletions resource/pics/skosmos-NEGA-RGB.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions resource/pics/skosmos-RGB.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions src/view/base-template.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@
<a class="visually-hidden" id="skiptocontent" href="{{ request.langurl }}#maincontent">Skip to main</a>
<header>
<div class="container-fluid bg-dark d-flex my-auto py-3 px-4 text-bg-dark">
<span class="fs-6 py-3 text-light">Yhteishaku sanastoista v</span>
{% if request.vocabid == '' and request.page != 'about' and request.page != 'feedback' %}
<span class="fs-6 py-3 text-light">Yhteishaku sanastoista v</span>
{% else %}
<a id="skosmos-logo-top" href="{{ request.lang }}/{% if request.contentLang and request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}{% if request.queryParam('anylang') == 'on' %}{% if request.contentLang == request.lang %}?{% else %}&{% endif %}anylang=on{% endif %}">
Copy link
Member

Choose a reason for hiding this comment

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

This is a terrible way of generating the link URL for the home page, but I see that it has been used in many other places as well (a few lines down in the same file) so I guess one more time doesn't hurt much.
However, I think a better mechanism should be developed. We already have the custom link_url filter, maybe it could be used instead, with some enhancements?

<h2 class="visually-hidden">Skosmos</h2>
</a>
{% endif %}
<ul class="nav nav-pills ms-auto my-auto text-light gx-3 py-3" id="topbar-nav">
<li class="nav-item">
<a href="{{ request.lang }}/{% if request.contentLang and request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}{% if request.queryParam('anylang') == 'on' %}{% if request.contentLang == request.lang %}?{% else %}&{% endif %}anylang=on{% endif %}" id="navi1" class="fs-6 text-light topbar-nav-link ms-3 text-decoration-none" >
Expand Down Expand Up @@ -59,7 +65,9 @@

<div class="container-fluid d-flex justify-content-between bg-light py-4 px-4" id="headerbar">
{% if request.vocabid == '' %}
<h2 class="fs-1 fw-bold text-decoration-none">Skosmos<h2>
<div id="skosmos-logo">
<h1 class="visually-hidden">Skosmos</h1>
</div>
{% else %}
<h2 class="fs-2 fw-bold text-decoration-none" id="vocab-title"><a class="text-decoration-none" href="{% if request.vocabid != '' %}{{ request.vocabid }}/{% endif %}{{ request.lang }}/{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{{ request.vocab.title(request.contentLang) }}</a></h2>
<div class="d-flex justify-content-end align-items-end" id="search-vocab"></div>
Expand Down