From bc51a8a72b702f1aa135e9f26e25cf2b360647e3 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Wed, 4 Oct 2017 13:07:27 +0200
Subject: [PATCH] Stil weiter angepasst
---
.../assets/less/metager/result-page.less | 42 ++++++++-----------
resources/lang/de/ad.php | 1 +
resources/lang/en/ad.php | 1 -
resources/lang/es/ad.php | 1 -
resources/views/layouts/ad.blade.php | 2 +-
.../views/layouts/researchandtabs.blade.php | 5 +--
6 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index fdc2d6c11..bb6ad1de8 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -35,7 +35,7 @@
@lsprev-or-lsnext-i-background-color: @result-page-color-black;
body {
background-image: inherit;
- background-color: @body-background-color;
+ background-color: white;
}
footer {
@@ -296,13 +296,9 @@ a {
}
.result {
- margin-top: 30px;
+ margin-top: 10px;
+ margin-bottom: 30px;
width: 100%;
- &>.number {
- font-size: 15px;
- line-height: 1;
- text-align: right;
- }
&>.resultInformation {
border-radius: 5px;
padding-left: 0px;
@@ -321,7 +317,7 @@ a {
.title {
color: @result-title-color;
text-decoration: none;
- font-size: 14px;
+ font-size: 18px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
@@ -331,7 +327,7 @@ a {
text-overflow: ellipsis;
}
.link {
- font-size: 13px;
+ font-size: 16px;
margin: 0;
line-height: 1.5;
&>div {
@@ -362,7 +358,7 @@ a {
.description {
margin-bottom: 3px;
color: @result-description-color;
- font-size: 14px;
+ font-size: 16px;
line-height: 1.3;
clear: both;
.date {
@@ -384,7 +380,12 @@ a {
}
}
&.ad {
- margin-left: 30px;
+ .ad-label {
+ border: green solid 1px;
+ padding: 1px;
+ color: green;
+ border-radius: 4px;
+ }
.description {
max-width: 115ch;
overflow: hidden;
@@ -479,15 +480,6 @@ a {
}
}
-#quicktips iframe {
- width: 100%;
- height: 800px;
- background-color: transparent;
- border: 0px none transparent;
- padding: 0px;
- overflow: hidden;
-}
-
.js-only {
display: none;
}
@@ -626,7 +618,6 @@ a {
}
}
-
/*
* <div id="quicktips">
* <div class="quicktip" type="TYPE">
@@ -657,21 +648,24 @@ a {
}
.quicktip-summary {
h1 {
- font-size: 16px;
+ font-size: 18px;
font-weight: bold;
}
+ p {
+ font-size: 16px;
+ }
}
.quicktip-detail {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
- font-size: 14px;
+ font-size: 16px;
font-weight: bold;
}
p {
display: none;
- font-size: 12px;
+ font-size: 14px;
}
}
.gefVon {
diff --git a/resources/lang/de/ad.php b/resources/lang/de/ad.php
index 000f5b3c2..45514ae25 100644
--- a/resources/lang/de/ad.php
+++ b/resources/lang/de/ad.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'werbung' => 'Werbung',
'von' => 'Werbung von',
];
diff --git a/resources/lang/en/ad.php b/resources/lang/en/ad.php
index ad94ee89e..b62512838 100644
--- a/resources/lang/en/ad.php
+++ b/resources/lang/en/ad.php
@@ -1,5 +1,4 @@
<?php
return [
- 'von' => 'Advertisement by',
];
diff --git a/resources/lang/es/ad.php b/resources/lang/es/ad.php
index 9332c62b6..6dd355233 100644
--- a/resources/lang/es/ad.php
+++ b/resources/lang/es/ad.php
@@ -1,5 +1,4 @@
<?php
return [
- "von" => "Reclamo de:"
];
\ No newline at end of file
diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php
index 1d9cd7806..79a11634e 100644
--- a/resources/views/layouts/ad.blade.php
+++ b/resources/views/layouts/ad.blade.php
@@ -11,7 +11,7 @@
{{ $ad->anzeigeLink }}
</a>
<span class="hoster">
- {!! trans('ad.von') !!} {!! $ad->gefVon !!}
+ <span class="ad-label">{!! trans('ad.werbung') !!}</span> {!! trans('ad.von') !!} {!! $ad->gefVon !!}
</span>
</p>
<p class="description">
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index e52ad86ee..2b5e3f44d 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -17,12 +17,11 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
</div>
<div class="col-xs-9 dense-col">
- <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
+ <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form search-bar-input" id="submitForm">
<div class="input-group">
<input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
<div class="input-group-addon">
- <button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i>
- </button>
+ <button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
</div>
</div>
@foreach( $metager->request->all() as $key => $value)
--
GitLab