diff --git a/resources/assets/js/results.js b/resources/assets/js/results.js
index c35d79f38cf9f371a7f0a1b688a8f393c5c8743b..e2ed899adf58d7ce1e613fefb489423854ed165f 100644
--- a/resources/assets/js/results.js
+++ b/resources/assets/js/results.js
@@ -250,34 +250,33 @@ Result.prototype.remove = function () {
Result.prototype.toHtml = function () {
var result = $('\
- <div class="result row">\
- <div class="col-sm-1 glyphicon glyphicon-trash remover" title="Ergebnis aus dem Speicher löschen">\
+ <div class="saved-result result">\
+ <div class="saved-result-remover remover" title="Ergebnis aus dem Speicher löschen">\
+ <i class="fa fa-trash"></i>\
</div>\
- <div class="result-information col-xs-12 col-sm-11">\
- <div class="col-xs-10 col-sm-11" style="padding:0; ">\
- <p class="title">\
- <a class="title" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="1" rel="noopener">\
- ' + this.title + '\
+ <div class="saved-result-content">\
+ <h2 class="result-title">\
+ <a class="title" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="1" rel="noopener">\
+ ' + this.title + '\
+ </a>\
+ </h2>\
+ <div class="result-header">\
+ <div class="result-link">\
+ <a href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="' + this.index + '" rel="noopener">\
+ ' + this.anzeigeLink + '\
</a>\
- </p>\
- <div class="link">\
- <div>\
- <div class="link-link">\
- <a href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="' + this.index + '" rel="noopener">\
- ' + this.anzeigeLink + '\
- </a>\
- </div>\
</div>\
- <span class="hoster">\
- ' + this.gefVon + '\
+ <span class="result-hoster">' + this.gefVon + '</span>\
+ <span class="result-proxy">\
+ <a class="result-proxy" onmouseover="$(this).popover(\'show\');" onmouseout="$(this).popover(\'hide\');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="' + this.proxy + '" target="_blank" rel="noopener" data-original-title="" title="">\
+ <img src="/img/proxyicon.png" alt="">\
+ anonym öffnen\
+ </a>\
</span>\
- <a class="proxy" onmouseover="$(this).popover(\'show\');" onmouseout="$(this).popover(\'hide\');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="' + this.proxy + '" target="_blank" rel="noopener" data-original-title="" title="">\
- <img src="/img/proxyicon.png" alt="">\
- anonym öffnen\
- </a>\
</div>\
- </div>\
- <div class="description">' + this.description + '</div>\
+ <div class="result-body">\
+ <div class="description">' + this.description + '</div>\
+ </div>\
</div>\
</div>');
$(result).find('.remover').click({caller: this}, function (event) {
diff --git a/resources/assets/less/metager/result-saver.less b/resources/assets/less/metager/result-saver.less
index cad391a2ff4ceab1d0ddd8371b8c9258a3eaf5c5..0a95ec0927d20d0e283dfd60c70f8c28edc72c57 100644
--- a/resources/assets/less/metager/result-saver.less
+++ b/resources/assets/less/metager/result-saver.less
@@ -1,5 +1,10 @@
+@saved-result-distance-first: 10px;
+@saved-result-distance-between: 10px;
+
#savedFoki {
padding-top: 50px;
+ display: flex;
+ flex-direction: column;
#saver-options {
display: flex;
flex-direction: column;
@@ -22,4 +27,20 @@
width: 100%;
}
}
+ .saved-result {
+ display: flex;
+ align-items: baseline;
+ margin-top: @saved-result-distance-first;
+ margin-bottom: @saved-result-distance-between;
+ padding-bottom: @saved-result-distance-between;
+ .saved-result-remover {
+ padding: 0px 10px;
+ .fa {
+ font-size: 20px;
+ }
+ }
+ .saved-result-content {
+ overflow: hidden;
+ }
+ }
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index 33a367c37cc0a662ceccc4be0e7e16245808b561..7ec14bfd2d47c52b04ac1ad9a13e770053a60455 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -79,7 +79,7 @@
margin-top: 0;
margin-left: 10px;
}
- .result-proxy {
+ .result-proxy, .result-proxy a {
font-size: 13px;
margin-top: 0;
white-space: nowrap;
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 03bf4ab354762fdced4bdc52586f74de21040a06..5b2b81cb07719c43f12bfdb51430856f4b7d3c48 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -56,10 +56,12 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
</span>
@endif
- <a class="result-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
- <img src="/img/proxyicon.png" alt="" />
- <span>{!! trans('result.options.5') !!}</span>
- </a>
+ <span class="result-proxy">
+ <a onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
+ <img src="/img/proxyicon.png" alt="" />
+ <span>{!! trans('result.options.5') !!}</span>
+ </a>
+ </span>
</div>
<div class="result-body">
@if( isset($result->logo) )