Commit 2ca084b0 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '64-styles-fur-die-handyversion-werden-noch-nicht-korrekt-ubernommen' into 'master'

Resolve "Styles für die Handyversion werden noch nicht korrekt übernommen"

Closes #64

See merge request !66
parents 908a8c69 f3b711b6
......@@ -361,6 +361,14 @@ a:hover
margin-right:2px
}
.result .image {
padding:0;
}
.result .image > img{
max-width: 100%;
}
.popover-content{
/*padding-left: 0;
padding-right:0;*/
......
* {
}
.content-wrapper {
padding-top: 50px;
}
div#fokiChanger {
margin-bottom: 0;
}
#fokiChanger a {
color: grey;
}
li.list-group-item.selected {
background-color: #f5f5f5;
}
select#fokiChanger {
width: 100%;
height: 30px;
text-align: center;
background-color: inherit;
border: 0;
}
header#research {
width: 100%;
margin-left: -50%;
}
p.link {
white-space: nowrap;
}
header nav {
width: 100%;
padding: 0 10px;
margin-left: 0;
}
/* Research Bar */
#researchBar{
width:100%;
margin-left: -50%;
padding-left:0;
padding-right:0;
}
/* Result Boxen */
.result{
padding:0;
}
.result > .resultInformation{
margin-left:0;
padding-left:0;
}
.result .link a{
white-space:nowrap;
overflow:hidden;
}
.result.ad .link > a {
width: 50%;
max-width: 15ch;
overflow: hidden;
display: inline-flex;
text-overflow: ellipsis;
}
.result .hoster{
white-space:nowrap;
}
.row{
margin: 10px 0;
}
.row .col-md-8 {
padding: 0 10px;
}
.container-fluid {
padding: 5px 0;
}
.panel .panel-heading {
padding-top: 5px;
padding-bottom: 5px;
}
.content-wrapper{
width: 100%;
}
.result .link-link{
max-width:90%;
}
.alert ul {
padding-left:0px;
}
.resultContainer {
padding: 0!important;
}
\ No newline at end of file
......@@ -12,7 +12,7 @@
if( !isset($_SERVER['HTTP_X_FORWARDED_FOR'] ))
{
$_SERVER['REMOTE_ADDR'] = substr($_SERVER['REMOTE_ADDR'], 0, strrpos($_SERVER['REMOTE_ADDR'], ".")) . ".0";
$_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 23);
#$_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 23);
}
/*
......
<div class="result row">
<div class="number col-sm-1" style="color:{{ $result->color }}">
<div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
{{ $result->number }})
</div>
@if( $result->image !== "" )
<div class="image col-sm-1">
<img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" height="50px" />
<div class="image col-xs-2 col-sm-1">
<img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
</div>
@endif
<div class="resultInformation col-sm-10">
<div class="resultInformation col-xs-10 col-sm-10">
<p class="title">
<a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ $result->gefVon }}" data-count="{{ $result->number }}">
{{ $result->titel }}
......
......@@ -5,7 +5,7 @@
<title>{{ $metager->getQ() }} - MetaGer</title>
<link href="/css/bootstrap.css" rel="stylesheet" />
<link href="/css/styleResultPage.css" rel="stylesheet" />
@if( isset($mobile) )
@if( isset($mobile) && $mobile )
<link href="/css/styleResultPageMobile.css" rel="stylesheet" />
@endif
<link href="/css/theme.css.php" rel="stylesheet" />
......
......@@ -2,7 +2,7 @@
@section('results')
<div class="col-md-8">
<div class="col-xs-12 col-md-8 resultContainer">
{{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
......@@ -18,7 +18,7 @@
{!! $metager->getResults()->links() !!}
</nav>
</div>
<div class="col-md-4" id="quicktips">
<div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
</div>
......
<div class="col-md-8">
<div class="col-xs-12 col-md-8">
{{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
......@@ -14,7 +14,7 @@
{!! $metager->getResults()->links() !!}
</nav>
</div>
<div class="col-md-4" id="quicktips">
<div class="hidden-xs col-md-4" id="quicktips">
<iframe class="col-mod-4 hidden-xs hidden-sm" src="/qt?q={{ $metager->getQ() }}&sprueche={{ $metager->getSprueche() }}"></iframe>
</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