From 0ab7ebf66b85c0b12096919c55de062b1827c3b4 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Fri, 4 May 2018 11:07:29 +0200
Subject: [PATCH] =?UTF-8?q?Quicktips=20entsprechend=20umgebaut,=20jetzt=20?=
=?UTF-8?q?mit=20richtiger=20Struktur=20f=C3=BCr=20alle=20Varianten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/assets/less/metager/result.less | 7 +++++-
resources/views/parts/quicktip.blade.php | 28 ++++++++++++++++-------
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index c7dc48518..c72869711 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -50,8 +50,13 @@
}
}
}
+<<<<<<< Updated upstream
.result-body {
margin-top: 20px;
+=======
+ .resultpage-body {
+ margin-top: 10px;
+>>>>>>> Stashed changes
.result-description {
margin-bottom: 3px;
word-break: break-word;
@@ -84,7 +89,7 @@
}
}
.result-footer {
- margin-top: 25px;
+ margin-top: 10px;
display: flex;
flex-wrap: wrap;
overflow: auto;
diff --git a/resources/views/parts/quicktip.blade.php b/resources/views/parts/quicktip.blade.php
index cc9a8be6f..25f642510 100644
--- a/resources/views/parts/quicktip.blade.php
+++ b/resources/views/parts/quicktip.blade.php
@@ -40,15 +40,27 @@
</details>
@else
<div class="quicktip-summary">
- @if ($quicktip->title != "")
- <h1>
- @if ($quicktip->link != "")
- <a href="{{ $quicktip->link }}">{{ $quicktip->title }}</a>
- @else
- {{ $quicktip->title }}
+ <div class="quicktip-headline">
+ @if ($quicktip->title != "")
+ <h1 class="quicktip-title">
+ @if ($quicktip->link != "")
+ <a href="{{ $quicktip->link }}">{{ $quicktip->title }}</a>
+ @else
+ {{ $quicktip->title }}
+ @endif
+ </h1>
+ <div class="space-taker"></div>
+ @if ($quicktip->gefVonLink != "")
+ <a class="quicktip-hoster" href="{{ $quicktip->gefVonLink }}" target="_blank" rel="noopener">
+ @if ($quicktip->gefVonTitle != "")
+ {{ $quicktip->gefVonTitle }}
+ @else
+ {{ $quicktip->gefVonTitle }}
+ @endif
+ </a>
@endif
- </h1>
- @endif
+ @endif
+ </div>
<p>{!! $quicktip->descr !!}</p>
</div>
@endif
\ No newline at end of file
--
GitLab