From 88a2628258eb5ea79736338637ab8b5b83680c92 Mon Sep 17 00:00:00 2001
From: horus
Date: Mon, 18 Jun 2018 15:54:46 +0200
Subject: Fix card-overlay problem with links. (website)

---
 site/app/Http/Controllers/IndexController.php |   2 +-
 site/public/css/custom.css                    |   3 +++
 site/public/img/feed-icon-gray.jpg            | Bin 0 -> 26755 bytes
 site/resources/views/feeds.blade.php          |   2 +-
 site/resources/views/index.blade.php          |   5 +++--
 5 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 site/public/img/feed-icon-gray.jpg

(limited to 'site')

diff --git a/site/app/Http/Controllers/IndexController.php b/site/app/Http/Controllers/IndexController.php
index 9023ac2..09ff3a2 100644
--- a/site/app/Http/Controllers/IndexController.php
+++ b/site/app/Http/Controllers/IndexController.php
@@ -25,7 +25,7 @@ class IndexController extends Controller {
 		# subquery to get procent, because cheap spirits don't look good
 		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY procent DESC LIMIT 1)";
 	    }
-		$query .= " UNION (SELECT 'Alle Angebote' as name, '/img/paw-400-400.png' as image_url, 'RSS-Feeds' as spirit_type, 'feeds' AS url, 'RSS-Feeds' AS angebotsname, (SELECT MAX(procent) FROM all_view) as procent, 'Zu den RSS-Feeds' AS linktext FROM all_view LIMIT 1)";
+		$query .= " UNION (SELECT 'Alle Angebote' as name, '/img/feed-icon-gray.jpg' as image_url, 'RSS-Feeds' as spirit_type, 'feeds' AS url, 'RSS-Feeds' AS angebotsname, (SELECT MAX(procent) FROM all_view) as procent, 'Zu den RSS-Feeds' AS linktext FROM all_view LIMIT 1)";
 
 	    $data = DB::select($query);
 
diff --git a/site/public/css/custom.css b/site/public/css/custom.css
index 23f8d32..b2e3549 100644
--- a/site/public/css/custom.css
+++ b/site/public/css/custom.css
@@ -119,6 +119,9 @@ body > .container {
 	border-top: 2px solid #1289A7; 
 	*/
 }
+.card-link {
+	position: relative;
+}
 
 footer {
 	/*
diff --git a/site/public/img/feed-icon-gray.jpg b/site/public/img/feed-icon-gray.jpg
new file mode 100644
index 0000000..43b5e84
Binary files /dev/null and b/site/public/img/feed-icon-gray.jpg differ
diff --git a/site/resources/views/feeds.blade.php b/site/resources/views/feeds.blade.php
index 5ab6bb5..e4b4aca 100644
--- a/site/resources/views/feeds.blade.php
+++ b/site/resources/views/feeds.blade.php
@@ -65,7 +65,7 @@ foreach( $data as $offer) {
 						</a>
 					</h3>
 				
-					<a class="w-100 u" href="/{{ $offer->url }}" style="word-wrap: none;">{{ $offer->linktext }}</a>
+					<a class="w-100 u card-link" href="/{{ $offer->url }}" style="word-wrap: none;">{{ $offer->linktext }}</a>
 			</div>
 		</a>
 			<img {{ $width }} data-href="/{{ $offer->url }}" class="card-img-right border-white img-thumbnail d-none d-xs-none d-md-block float-right img-responsive js-link-replacement" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{ $offer->name }}">
diff --git a/site/resources/views/index.blade.php b/site/resources/views/index.blade.php
index 1b60c43..7eb501f 100644
--- a/site/resources/views/index.blade.php
+++ b/site/resources/views/index.blade.php
@@ -70,13 +70,14 @@ if ( empty($data) ) {
 
 <div class="col-md-6 col-sm-12" id="{{ $offer->name }}">
 	<div class="card flex-md-row mb-4 box-shadow h-md-250 h-sm-500">
-		<img class="card-img-top flex-auto d-xs-block d-sm-block img-thumbnail d-md-none" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{ $offer->name }}">
+		<img class="rounded card-img-top flex-auto d-xs-block d-sm-block img-thumbnail d-md-none" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{ $offer->name }}">
 		<div class="card-body d-flex flex-column align-items-start">
+
 			<div class="d-inline align-items-start text-left w-100 mb-2">
 				<strong class="text-dark">{{ $offer->spirit_type }}</strong>
 			</div>
 			<h3 class="mb-0 d-inline-block h-100">
-				<a class="text-dark" href="/{{ $offer->url }}">
+				<a class="text-dark card-link" href="/{{ $offer->url }}">
 					Hier geht es zu den {{ $offer->angebotsname }}
 				</a>
 			</h3>
-- 
cgit v1.2.3