diff --git a/resources/assets/less/metager/general.less b/resources/assets/less/metager/general.less
index f7e4198193eaa5bc2bcc0c040d8e163572b0ab40..6c6349e16454eb9f27f56a8ab87d07a2f9d241c0 100644
--- a/resources/assets/less/metager/general.less
+++ b/resources/assets/less/metager/general.less
@@ -175,4 +175,8 @@ label a {
text-decoration: none;
color: inherit;
}
+}
+
+button {
+ border: none;
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 0d9503374b5da84ba507abcd31c9d97db1c6bb50..d2e2489f386697a12a8cbae0a2d0ea9cb243e50a 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -187,6 +187,16 @@ a {
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
+ font-style: italic;
+ margin: 0;
+ font-weight: bold;
+ line-height: 1;
+ white-space: nowrap;
+}
+
+p.mg-logo {
+ font-size: 18px;
+ display: inline-block;
}
#header-searchbar {
diff --git a/resources/assets/less/metager/sidebar.less b/resources/assets/less/metager/sidebar.less
index 1fab8fd1df3b783f2138fa5322720610eb9523e0..941dd3a9bd2d299cfc142ef5d9e81562e1d15f9f 100644
--- a/resources/assets/less/metager/sidebar.less
+++ b/resources/assets/less/metager/sidebar.less
@@ -94,6 +94,7 @@
color: red;
}
}
+
p {
width: 90%;
text-align: center;
@@ -102,15 +103,12 @@
font-size: large;
background-color: rgb(255, 128, 0);
border-radius: .25em;
- a,
- a:hover {
- color: white;
- font-size: 30px;
- line-height: 35px;
- }
- cursor: default;
- margin: 5%
+ margin: 5%;
+ color: white;
+ font-size: 30px;
+ line-height: 35px;
}
+
.caret {
position: absolute;
left: 90%;
diff --git a/resources/lang/de/hilfe.php b/resources/lang/de/hilfe.php
index 3896ed5760eb33ce15ea54f969005c02caf452b0..9f19c5cb58f60cb3124ead8dea6e6470cb0ff1df 100644
--- a/resources/lang/de/hilfe.php
+++ b/resources/lang/de/hilfe.php
@@ -11,7 +11,7 @@ return [
"allgemein.3" => "Ein Plugin für die allermeisten Browser finden Sie <a href=\"/#plugin-modal\" target=\"_blank\" rel=\"noopener\">direkt unter dem Suchfeld</a>, wo die meisten Browser bereits voreingestellt sind.",
"suchfokus.title" => "Auswahl des Suchfokus",
- "suchfokus.1" => "Über dem Suchfeld finden Sie fünf Sucheinstellungen, die für die meisten Suchwünsche genügen ( „Web“, „Bilder“, „Nachrichten“, „Wissenschaft“ sowie „Produkte“ ).",
+ "suchfokus.1" => "Neben dem Suchfeld finden Sie ein ausklappbares Menü mit fünf Sucheinstellungen, die für die meisten Suchwünsche genügen ( „Web“, „Nachrichten“, „Wissenschaft“, „Produkte“ sowie „Karte“).",
"suchfokus.2" => "Mit diesem Knopf können Sie einen neuen eigenen Suchfokus erstellen:",
"suchfokus.3" => "Geben Sie zunächst einen Namen für ihren neuen Suchfokus ein und wählen sie anschließend alle Suchmaschinen aus deren Ergebnisse Sie erhalten möchten. Abschließend klicken Sie auf den blauen Knopf \"Suchfokus speichern\"",
"suchfokus.4" => "Sie können auch einen vorhandenen eigenen Suchfokus verändern, indem Sie auf den Stift (<i class=\"fa fa-pencil\" aria-hidden=\"true\"></i>) neben dem Namen des Suchfokus klicken.",
diff --git a/resources/views/hilfe.blade.php b/resources/views/hilfe.blade.php
index 2ef063c2770cceaaa3eece7d66f543452bad48eb..ce4c52627063a3988e4934a1a38b04a4c053d8d9 100644
--- a/resources/views/hilfe.blade.php
+++ b/resources/views/hilfe.blade.php
@@ -14,10 +14,10 @@
<ul class="dotlist">
<li>{!! trans('hilfe.allgemein.1') !!}
<a id="settings-btn" class="mutelink btn btn-default" href="#">
- <i class="fa fa-cog" aria-hidden="true"></i>
+ <i class="fa fa-sliders" aria-hidden="true"></i>
</a>
</li>
- <li>{!! trans('hilfe.allgemein.2') !!}</li>
+ {{-- <li>{!! trans('hilfe.allgemein.2') !!}</li> --}}
<li>{!! trans('hilfe.allgemein.3') !!}</li>
</ul>
</div>
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index 0c9bdc6a9d89867f4cc86fb5dca9d24d65a38dcf..cba4263b0b7176eaf9c74a8cb39cfa04c5a9e809 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -2,9 +2,9 @@
<label id="openSidebar" role="button" for="sideBarToggle"></label>
<div class="sideBar">
<label id="closeSidebar" role="button" for="sideBarToggle"></label>
- <p>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a>
- </p>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+ <p>MetaGer</p>
+ </a>
<ul id="metager-static-nav-list" class="list-inline pull-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">
diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php
index 0f296bb23a2d00b80406c91657191ee07086e6b7..8885f7374bee523ba6c0953ee5e4a0ff6b10ad4b 100644
--- a/resources/views/widget/sitesearch.blade.php
+++ b/resources/views/widget/sitesearch.blade.php
@@ -17,7 +17,7 @@
@if ($site !== '')
<h2>{{ trans('sitesearch.generated.1') }}</h2>
<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><p class="mg-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer">MetaGer</p></a>
<input class="metager-searchinput" name="eingabe" placeholder="{{ trans('sitesearch.generated.3') }}" required="">
<button class="metager-searchbutton" type="submit">{{ trans('sitesearch.generated.4') }}</button>
<input type="hidden" name="lang" value="{{ trans('sitesearch.generated.6') }}">
@@ -62,10 +62,15 @@
background-color: #EEE;
}
.metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
+ color: #ff8000;
+ font-family: Liberation Sans, sans-serif;
+ font-style: italic;
+ margin: 0;
+ font-weight: bold;
+ font-size: 18px;
+ display: inline-block;
+ line-height: 1;
+ white-space: nowrap;
}
</style>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('sitesearch.generated.2') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
diff --git a/resources/views/widget/websearch.blade.php b/resources/views/widget/websearch.blade.php
index 62920bae88ffdaf24cd40837f058cd8d7845f1f6..98a1e68eb7f7f5bf318115f87de9362faa7a53ca 100644
--- a/resources/views/widget/websearch.blade.php
+++ b/resources/views/widget/websearch.blade.php
@@ -7,7 +7,7 @@
<p>{{ trans('websearch.head.2') }}</p>
<h2>{{ trans('websearch.head.3') }}</h2>
<form class="metager-searchform" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}/meta/meta.ger3" method="GET" accept-charset="UTF-8" >
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><p class="mg-logo">MetaGer</p></a>
<input class="metager-searchinput" name="eingabe" placeholder="{{ trans('websearch.head.5') }}" required="">
<input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
<input type="hidden" name="encoding" value="utf8">
@@ -51,10 +51,15 @@
background-color: #EEE;
}
.metager-logo {
- height: 30px;
- float: left;
- top:-2px;
- margin-right: 3px;
+ color: #ff8000;
+ font-family: Liberation Sans, sans-serif;
+ font-style: italic;
+ margin: 0;
+ font-weight: bold;
+ font-size: 18px;
+ display: inline-block;
+ line-height: 1;
+ white-space: nowrap;
}
</style>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><img class="metager-logo" title="{{ trans('websearch.head.4') }}" alt="MetaGer" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAABGAgMAAAAx/qk0AAAADFBMVEX/wmn/3KL/6Mj+/vtPnQnhAAAC10lEQVRIx+2XMa7TQBCG1zaJkYwUGp5E5RbR+AJI9g2gQLQ0vDpHsMUJKB49DRIKBRdAco6wN8AFB7CQkfzEZod/Zu3ENgSkbRBStnDkt/uNZ/6ZnX2r6KvyGFujyIdTkVG9F6g+q9YPfKL2fuA9VfmBd1XhB95Rl3EZl/Evxur62dm5gAg7uqSxA613pw2+JqI358CQCD2EqBneEzr1ohLg4WyfJKwMT+CGqonNP4NaxfwYwaOrm7+DGzo6mJ5AeLojcw6M2ctMwNU13jM+GYIXzxUHrtWawQc3TsdXUzAhCJqzQkFNnbjXc3AavljMPxJxNdTvtrOvY2UH2wBhwgrYxUzjfThdMn4L6Rv1c/BTF9AXRMbiVykeLUyIjWbMNN5C+oEvzMCXfURbknnS2QgSPrQfVUCRROzKFEzpqUlsTgipj6l9THb3bnODzxf5oC++nNKewdn5ltHGpCZnz3QIm7Xhc4WzUg4nLwwkpGO4e38K5pQc8g5gCn1Yp36sg9qy+50qLbzRydxRgDa2dVseYEHNQVGE/2Ic2CxBrh04CMOgAjG8ZTlQbZhqA5iKqNnQ4iAuD5itANYsHjLTSlFA1QGUUic9KX43ahPyIqNkvgsZLEcw/EhN5MBJDY9ggBVwx4ERQMmoVVxx0QRcFDkjEpnMt1iJ1bcqhzHi5GsH7rPfgW14lDOS3akROoIuuB9ETs6cli0HOdccmQMZ4u6BoEv8TEC7bDmtKiuOjEtmXQxgCDCXXVaJXA/Z919A0YCrc1UDtB+Qa95SGTcAqli7qwP7vugc7eBgLjnAVjCSxs5lE3Hy04hDc7CRNqBda+KUY5eRBegyr8SiUcvmE0t7YzkiSZ6SIqDv7AjX0q1rdr2ixT+biYBSiLW07Yz3A70eKs8W0l7xs9wc08wcD4qV62rq6r2U2eptcTlGL+O/HN4XFu8rkvelzPsa6H3x9L7q+l6ufwK7PWV5kEbECQAAAABJRU5ErkJggg=="></a>