Merge branch '327-logo-auf-der-startseite-fur-mobilgerate' into 'development'

Logo und Links der Werbeergebnisse werden jetzt wieder korrekt angezeit

Closes #327

See merge request !513

public/css/styleResultPage.css

@@ -87,11 +87,24 @@ nav .input-group {
 
 header nav {
     height: 100%;
+    display: table;
 }
 
 header ul {
     height: 100%;
     vertical-align: middle;
+    display: table-row;
+}
+
+header li.pull-left.visible-xs {
+    float: left !important;
+    width: auto;
+}
+
+header li.pull-right {
+    width: 100% !important;
+    float: none !important;
+    display: table-cell;
 }
 
 #research nav ul > li {
@@ -245,6 +258,15 @@ a:hover {
 
 /* Hier der Style für die einzelnen Ergebnisboxen */
 
+p.link > a {
+    white-space: nowrap;
+    max-width: 50%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    float: left;
+    padding-right: 5px;
+}
+
 .result {
     margin-bottom: 10px;
     width: 100%
@@ -569,4 +591,4 @@ footer a {
 
 .product img {
     max-width: 100px;
-}
+}
\ No newline at end of file

public/css/styleResultPageMobile.css

@@ -55,13 +55,15 @@ header nav {
     overflow: hidden;
 }
 
+
+/*
 .result.ad .link > a {
     width: 50%;
     max-width: 15ch;
     overflow: hidden;
-    display: inline-flex;
     text-overflow: ellipsis;
 }
+*/
 
 .result .hoster {
     white-space: nowrap;

resources/views/index.blade.php

-@extends('layouts.staticPages')
+@extends('layouts.indexPage')
 
 @section('title', $title )
 

resources/views/layouts/indexPage.blade.php

+@extends('layouts.staticPages')
+
+@section('homeIcon')
+	<a class="navbar-brand visible-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+		<div class="logo">
+			<h1>MetaGer</h1>
+		</div>
+	</a>
+@endsection