Commit 5bcf54cb authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'Bugfix' into 'development'

Bugfix



See merge request !168
parents f92de798 50234c92
...@@ -148,4 +148,8 @@ ...@@ -148,4 +148,8 @@
Route::get('qt', 'MetaGerSearch@quicktips'); Route::get('qt', 'MetaGerSearch@quicktips');
Route::get('tips', 'MetaGerSearch@tips'); Route::get('tips', 'MetaGerSearch@tips');
Route::get('opensearch.xml', 'StartpageController@loadPlugin'); Route::get('opensearch.xml', 'StartpageController@loadPlugin');
Route::get('owi', function()
{
return redirect('https://metager.de/klassik/en/owi/');
});
}); });
...@@ -300,6 +300,7 @@ a:hover ...@@ -300,6 +300,7 @@ a:hover
} }
.result:not(.ad) .link > span{ .result:not(.ad) .link > span{
white-space:nowrap; white-space:nowrap;
margin: 0 5px;
} }
.result:not(.ad) .link .options{ .result:not(.ad) .link .options{
color: #333; color: #333;
...@@ -312,7 +313,7 @@ a:hover ...@@ -312,7 +313,7 @@ a:hover
color: #333; color: #333;
display:block; display:block;
padding-left:5px; padding-left:5px;
padding-right:10px; padding-right:5px;
} }
.result:not(.ad) .link .options > a > span{ .result:not(.ad) .link .options > a > span{
font-size:10px; font-size:10px;
......
...@@ -16,9 +16,9 @@ return [ ...@@ -16,9 +16,9 @@ return [
'sponsors.head.1' => 'Weitere Informationen', 'sponsors.head.1' => 'Weitere Informationen',
'sponsors.head.2' => 'Sponsoren', 'sponsors.head.2' => 'Sponsoren',
'sponsors.woxikon' => 'Woxikon: Nach Wörtern & Synonymen suchen', 'sponsors.woxikon' => '<a href="http://www.woxikon.de/" class="mutelink" target="_blank">Woxikon: Nach Wörtern & Synonymen suchen</a>',
'sponsors.gutscheine' => 'Aktuelle Gutscheine auf Gutschein-Magazin.de', 'sponsors.gutscheine' => '<a href="http://www.gutschein-magazin.de/" class="mutelink" target="_blank">Aktuelle Gutscheine auf Gutschein-Magazin.de</a>',
'sponsors.kredite' => 'Günstige Kredite auf FINANZCHECK.de vergleichen ', 'sponsors.kredite' => '<a href="https://www.finanzcheck.de/" class="mutelink" target="_blank">Günstige Kredite auf FINANZCHECK.de vergleichen ',
'about.title' => 'Über uns', 'about.title' => 'Über uns',
'about.1.1' => 'Datenschutz & Privatsphäre', 'about.1.1' => 'Datenschutz & Privatsphäre',
......
...@@ -13,12 +13,12 @@ return [ ...@@ -13,12 +13,12 @@ return [
'plugin' => 'Add the MetaGer-Plugin', 'plugin' => 'Add the MetaGer-Plugin',
'sponsors.head.1' => 'Further Information', 'sponsors.head.1' => 'Further Information',
'sponsors.head.2' => '', 'sponsors.head.2' => 'Sponsored Links',
'sponsors.woxikon' => '', 'sponsors.woxikon' => '<a href="/en/kontakt" class="mutelink" >This could be your link</a>',
'sponsors.gutscheine' => '', 'sponsors.gutscheine' => '<a href="/en/kontakt" class="mutelink" >Please contact us</a>',
'sponsors.kredite' => '', 'sponsors.kredite' => '<a href="/en/kontakt" class="mutelink">https://metager.de/kontakt</a>',
'about.title' => 'About us', 'about.title' => 'About Us',
'about.1.1' => 'Data protection & privacy', 'about.1.1' => 'Data protection & privacy',
'about.1.2' => ' are simple and natural for us.', 'about.1.2' => ' are simple and natural for us.',
'about.2.1' => 'We do not work for profit. We are a ', 'about.2.1' => 'We do not work for profit. We are a ',
......
...@@ -8,7 +8,7 @@ return [ ...@@ -8,7 +8,7 @@ return [
'nav5' => 'Contact', 'nav5' => 'Contact',
'nav6' => 'Team', 'nav6' => 'Team',
'nav7' => 'About us', 'nav7' => 'About us',
'nav8' => 'Site Notice', 'nav8' => 'Imprint',
'nav9' => 'Help', 'nav9' => 'Help',
'nav10' => 'Widget', 'nav10' => 'Widget',
'nav11' => 'Associator', 'nav11' => 'Associator',
......
...@@ -204,13 +204,13 @@ ...@@ -204,13 +204,13 @@
<h2>{{ trans('index.sponsors.head.2') }}</h2> <h2>{{ trans('index.sponsors.head.2') }}</h2>
<ul> <ul>
<li> <li>
<a href="http://www.woxikon.de/" class="mutelink" target="_blank">{{ trans('index.sponsors.woxikon') }}</a> {!! trans('index.sponsors.woxikon') !!}</a>
</li> </li>
<li> <li>
<a href="http://www.gutschein-magazin.de/" class="mutelink" target="_blank">{{ trans('index.sponsors.gutscheine') }}</a> {!! trans('index.sponsors.gutscheine') !!}
</li> </li>
<li> <li>
<a href="https://www.finanzcheck.de/" class="mutelink" target="_blank">{{ trans('index.sponsors.kredite') }}</a> {!! trans('index.sponsors.kredite') !!}
</li> </li>
</ul> </ul>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment