Improves the layout.

4 files changed, 36 insertions, 18 deletions

diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index 7ff92d3..82b109c 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
     <div class="container">
-      <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
+      <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark bbg-white ttext-dark box-shadow">
         <div class="col-md-6 px-0">
           <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }}</h1>
           <!--p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Täglich neue Schnäppchen.</p-->
@@ -32,6 +32,14 @@ foreach( $data as $offer) {
 			<div class="card-body d-none d-md-flex flex-row align-items-start">
 				<div class="card-img-overlay" title="{{$offer->name}} :: {{ $offer->shop }}">
 					<p class="card-text bg-danger float-right rounded off-badge">{{ $offer->procent}}%</p>
+<!--
+					<p class="card-text h-100 float-right">
+						<span class="bg-danger ffloat-right rounded off-badge">{{ $offer->procent}}%</span>
+						<span class="created_at d-flex ffloat-right rounded">{{ date("d.m.y", $offer->created_at) }}</span>
+					</p>
+-->
+
+					<!--p class="card-text created_at h-100 float-right  d-flex fflex-column justify-content-end">{{ $offer->created_at}}</p-->
 				</div>
 				<div class="card-img-overlay w-55">
 					<div class="d-inline align-items-start text-left w-100 mb-2">
@@ -41,21 +49,27 @@ foreach( $data as $offer) {
 
 					<h4 class="mb-0 hide-overflow h-45">
 						<a class="text-dark ttext-truncate hide-overflow" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
+						<span class="text-fade-out"></span>
 					</h4>
 
-					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong>
+					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}*</strong>
 						<span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span>
 					</p>
 					<div class="mb-1 text-muted w-100">
 						<span class="float-right">{{ TF::fF($offer->volume) . " Liter" }}</span><span>{{ TF::fF($offer->abv) . "%" }} Alk.</span>
 					</div>
-					<a href="{{ $offer->url }}">Jetzt bestellen</a>
-					<p class="text-muted text-small w-100 nmt-10">
+					<a class="u" href="{{ $offer->url }}">Jetzt bestellen</a>
+					<p class="text-muted text-small w-100 nnmt-10">
 						Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span>
+						<br>
+<!--
+						<span class=" float-right">{{ date("d.m.Y", $offer->created_at) }}</span>
+-->
+						<span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span>
 					</p>
 				</div>
 			</div>
-			<img class="card-img-right flex-auto d-none d-md-block img-thumbnail" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}">
+			<img class="card-img-right flex-auto d-none d-md-block border-left-0 img-thumbnail" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}">
 
 			<!-- <= sm -->
 			<!-- Maybe make the image a link
@@ -85,12 +99,14 @@ foreach( $data as $offer) {
 						<span class="float-right">{{ TF::fF($offer->volume) . " Liter" }}</span><span>{{ TF::fF($offer->abv) . "%" }} Alk.</span>
 					</div>
 
-					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong>
+					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}*</strong>
 					<span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span>
 					</p>
 					<strong><a href="{{ $offer->url }}" class="text-large">Jetzt bestellen</a></strong>
 					<p class="text-muted text-small w-100 nmt-10">
 						Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span>
+						<br>
+						<span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span>
 					</p>
 				</div>
 			</div>
diff --git a/site/resources/views/snippets/footer.blade.php b/site/resources/views/snippets/footer.blade.php
index 80ea21e..c0365a4 100644
--- a/site/resources/views/snippets/footer.blade.php
+++ b/site/resources/views/snippets/footer.blade.php
@@ -1,4 +1,4 @@
-<footer class="footer">
+<footer class="footer border-top">
 	<div class="container">
 		<div class="row">
 			<div class="col">
diff --git a/site/resources/views/snippets/navbar.blade.php b/site/resources/views/snippets/navbar.blade.php
index f9f1860..51387da 100644
--- a/site/resources/views/snippets/navbar.blade.php
+++ b/site/resources/views/snippets/navbar.blade.php
@@ -1,6 +1,6 @@
     <header>                                                                                                                                                                                                         
       <!-- Fixed navbar -->
-      <nav class="navbar navbar-expand-md navbar-dark ffixed-top bg-dark">
+      <nav class="navbar navbar-expand-md navbar-dark ffixed-top bg-primary nnavbar-light">
         <a class="navbar-brand" href="/">Alkobote.de</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
@@ -27,7 +27,7 @@
             </li>
           </ul>
           <form class="form-inline mt-2 mt-md-0">
-            <input class="form-control mr-sm-2" type="text" placeholder="Suchen" aria-label="Search">
+            <input class="form-control mr-sm-2" type="text" placeholder="Suchen… zB Glenfiddich" aria-label="Search">
             <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Suchen</button>
           </form>
         </div>
diff --git a/site/resources/views/snippets/sortbuttons.blade.php b/site/resources/views/snippets/sortbuttons.blade.php
index fd568fa..bf99649 100644
--- a/site/resources/views/snippets/sortbuttons.blade.php
+++ b/site/resources/views/snippets/sortbuttons.blade.php
@@ -1,9 +1,9 @@
 
 <div class="container">
 <div class="row">
-<div class="btn-toolbar mb-2 align-top" role="toolbar" aria-label="Sortieren">
+<div class="btn-toolbar mb-2 align-top " role="toolbar" aria-label="Sortieren">
 	<div class="btn-group" role="group" aria-label="Sortieren">
-		<div class="dropdown">
+		<div class="dropdown mr-2">
 		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		   Preis 
 		  </button>
@@ -12,8 +12,8 @@
 		    <a class="dropdown-item" href="?sort=price&order=desc">Höchster Preis</a>
 		  </div>
 		</div>
-		<div class="dropdown">
-		  <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		<div class="dropdown mr-2">
+		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		  Name  
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -21,8 +21,8 @@
 		    <a class="dropdown-item" href="?sort=name&order=desc">Umgekehrt</a>
 		  </div>
 		</div>
-		<div class="dropdown">
-		  <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		<div class="dropdown mr-2">
+		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		 Shop 
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -30,8 +30,10 @@
 		    <a class="dropdown-item" href="?sort=shop&order=desc">Umgekehrt</a>
 		  </div>
 		</div>
-		<div class="dropdown">
-		  <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	</div>
+	<div class="btn-group" role="group" aria-label="Sortieren">
+		<div class="dropdown mr-2">
+		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		Preisnachlass
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -40,7 +42,7 @@
 		  </div>
 		</div>
 		<div class="dropdown">
-		  <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		Aktualität
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">