From d0994fb6c911d05d056c0802501585cbc5b5104d Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 13 Sep 2022 12:18:42 +0200
Subject: [PATCH] added a region identifier besides our logo
---
.../resources/less/metager/general/base.less | 39 ++++++++++++++++---
.../metager/pages/resultpage/result-page.less | 16 ++++++++
metager/resources/views/index.blade.php | 5 ++-
.../views/layouts/researchandtabs.blade.php | 3 ++
.../views/layouts/subPages.blade.php | 3 ++
5 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/metager/resources/less/metager/general/base.less b/metager/resources/less/metager/general/base.less
index d0fb98c72..cfce2407f 100644
--- a/metager/resources/less/metager/general/base.less
+++ b/metager/resources/less/metager/general/base.less
@@ -185,7 +185,7 @@ i.fa {
margin-bottom: 25px;
}
- &>a {
+ >a.logo {
.logo;
display: block;
width: fit-content;
@@ -200,33 +200,62 @@ i.fa {
width: 4.6em;
}
}
+
+ >a.lang {
+ display: block;
+ height: min-content;
+ align-self: flex-end;
+ position: relative;
+ left: -10px;
+ font-style: initial;
+
+ &>span {
+ font-size: 1rem;
+ display: block;
+ padding: .3rem;
+ }
+ }
}
#subpage-logo {
padding: 16px 0 5px 0px;
+ display: flex;
.navbar-brand {
.noprint;
- line-height: 100% !important;
font-size: 18px;
- height: 40px;
padding: 0;
padding-left: 8px;
- position: absolute;
z-index: 5;
- left: 10px;
h1 {
border: 0;
.logo;
font-size: 1.6em;
margin: 0;
+ line-height: 1;
+ padding-bottom: 0;
>img {
width: 4.8em;
}
}
}
+
+ a.lang {
+ display: block;
+ height: min-content;
+ align-self: flex-end;
+ position: relative;
+ bottom: -9px;
+ left: -4px;
+
+ &>span {
+ font-size: .7rem;
+ display: block;
+ padding: .1rem;
+ }
+ }
}
/* Links that look like text */
diff --git a/metager/resources/less/metager/pages/resultpage/result-page.less b/metager/resources/less/metager/pages/resultpage/result-page.less
index c516e9273..5ba7ebb2f 100644
--- a/metager/resources/less/metager/pages/resultpage/result-page.less
+++ b/metager/resources/less/metager/pages/resultpage/result-page.less
@@ -27,6 +27,7 @@
z-index: 0;
padding-right: 8px;
padding-left: 8px;
+ white-space: nowrap;
h1 {
.logo;
@@ -40,6 +41,17 @@
}
}
+ a.lang {
+ position: relative;
+ font-size: .7rem;
+ bottom: -6px;
+ left: -5px;
+
+ span {
+ padding: .1rem;
+ }
+ }
+
.screen-small {
display: none;
}
@@ -56,6 +68,10 @@
width: 20px;
}
}
+
+ a.lang {
+ left: 0;
+ }
}
}
diff --git a/metager/resources/views/index.blade.php b/metager/resources/views/index.blade.php
index f1836748c..1c3be273d 100644
--- a/metager/resources/views/index.blade.php
+++ b/metager/resources/views/index.blade.php
@@ -6,9 +6,12 @@
<div id="search-wrapper">
<div id="search-block">
<h1 id="startpage-logo">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+ <a class="logo" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<img src="/img/metager.svg" alt="MetaGer" />
</a>
+ <a class="lang" href="#">
+ <span>{{ App\Localization::getRegion() }}</span>
+ </a>
</h1>
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
@if(Request::filled('key'))
diff --git a/metager/resources/views/layouts/researchandtabs.blade.php b/metager/resources/views/layouts/researchandtabs.blade.php
index 38c731408..73c8646ae 100644
--- a/metager/resources/views/layouts/researchandtabs.blade.php
+++ b/metager/resources/views/layouts/researchandtabs.blade.php
@@ -9,6 +9,9 @@
<a class="screen-small" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" @if(!empty($metager) && $metager->isFramed())target="_top" @endif>
<h1><img src="/img/metager-schloss-orange.svg" alt="MetaGer" /></h1>
</a>
+ <a class="lang" href="#">
+ <span>{{ App\Localization::getRegion() }}</span>
+ </a>
</div>
<div id="header-searchbar">
@include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
diff --git a/metager/resources/views/layouts/subPages.blade.php b/metager/resources/views/layouts/subPages.blade.php
index 5e6f616c9..cfb7ab405 100644
--- a/metager/resources/views/layouts/subPages.blade.php
+++ b/metager/resources/views/layouts/subPages.blade.php
@@ -5,5 +5,8 @@
<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<h1><img src="/img/metager.svg" alt="MetaGer" /></h1>
</a>
+ <a class="lang" href="#">
+ <span>{{ App\Localization::getRegion() }}</span>
+ </a>
</div>
@endsection
--
GitLab