Commit be57995f authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

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
parents ee220ba7 d78ec07a
...@@ -87,11 +87,24 @@ nav .input-group { ...@@ -87,11 +87,24 @@ nav .input-group {
header nav { header nav {
height: 100%; height: 100%;
display: table;
} }
header ul { header ul {
height: 100%; height: 100%;
vertical-align: middle; 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 { #research nav ul > li {
...@@ -245,6 +258,15 @@ a:hover { ...@@ -245,6 +258,15 @@ a:hover {
/* Hier der Style für die einzelnen Ergebnisboxen */ /* 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 { .result {
margin-bottom: 10px; margin-bottom: 10px;
width: 100% width: 100%
...@@ -569,4 +591,4 @@ footer a { ...@@ -569,4 +591,4 @@ footer a {
.product img { .product img {
max-width: 100px; max-width: 100px;
} }
\ No newline at end of file
...@@ -55,13 +55,15 @@ header nav { ...@@ -55,13 +55,15 @@ header nav {
overflow: hidden; overflow: hidden;
} }
/*
.result.ad .link > a { .result.ad .link > a {
width: 50%; width: 50%;
max-width: 15ch; max-width: 15ch;
overflow: hidden; overflow: hidden;
display: inline-flex;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
*/
.result .hoster { .result .hoster {
white-space: nowrap; white-space: nowrap;
......
This diff is collapsed.
@extends('layouts.staticPages') @extends('layouts.indexPage')
@section('title', $title ) @section('title', $title )
......
@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
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