Commit 4121cd9b authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '76-formatierung-der-mobilen-version' into 'master'

Style für die mobile Version repariert

Closes #76

See merge request !87
parents 4140bcca 5d671b9b
...@@ -432,28 +432,15 @@ a:hover ...@@ -432,28 +432,15 @@ a:hover
color:green; color:green;
} }
/* Style für den Footer */ /* Style für den Footer */
.footer{ footer{
padding: 15px 0; text-align: center;
margin-top:50px;
margin-bottom: 0;
}
.footer a{
color:black;
}
.footer li{
width:49%;
padding:0;
margin:0;
text-align:center;
}
.footer .left{
text-align:right;
padding-right:20px;
} }
.footer .right{
text-align:left; footer a{
padding-left:20px; color: black!important;
} }
/* Ein resetter für Floats */ /* Ein resetter für Floats */
.clearfix{ .clearfix{
clear:both; clear:both;
......
...@@ -52,10 +52,7 @@ header nav { ...@@ -52,10 +52,7 @@ header nav {
.result{ .result{
padding:0; padding:0;
} }
.result > .resultInformation{
margin-left:0;
padding-left:0;
}
.result .link a{ .result .link a{
white-space:nowrap; white-space:nowrap;
overflow:hidden; overflow:hidden;
......
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
<div class="image col-xs-2 col-sm-1"> <div class="image col-xs-2 col-sm-1">
<img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" /> <img src="{{ $metager->getImageProxyLink($result->image) }}" alt="" />
</div> </div>
@endif
<div class="resultInformation col-xs-10 col-sm-10"> <div class="resultInformation col-xs-10 col-sm-10">
@else
<div class="resultInformation col-xs-12 col-sm-12">
@endif
<p class="title"> <p class="title">
<a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}"> <a class="title" href="{{ $result->link }}" target="{{ $metager->getTab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
{{ $result->titel }} {{ $result->titel }}
......
...@@ -46,12 +46,14 @@ ...@@ -46,12 +46,14 @@
@endif @endif
<footer> <footer>
<ul class="list-unstyled list-inline footer"> <div class="row">
<li class="left"><a class="btn btn-default" href="/">MetaGer-Startseite</a> <div class="col-xs-6">
</li> <a class="btn btn-default" href="/">MetaGer-Startseite</a>
<li class="right"><a class="btn btn-default" href="/impressum/">Impressum</a> </div>
</li> <div class="col-xs-6">
</ul> <a class="btn btn-default" href="/impressum/">Impressum</a>
</div>
</div>
</footer> </footer>
<script src="/js/jquery.js" type="text/javascript"></script> <script src="/js/jquery.js" type="text/javascript"></script>
<script src="/js/bootstrap.js" type="text/javascript"></script> <script src="/js/bootstrap.js" type="text/javascript"></script>
......
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