From 0838e06d51ebba69dbb830bf979bc88862a274a6 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Fri, 27 Jul 2018 09:41:31 +0200
Subject: [PATCH] =?UTF-8?q?Orange=20als=20Farbe=20gr=C3=B6=C3=9Ftenteils?=
=?UTF-8?q?=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Models/Result.php | 4 ++--
resources/assets/less/metager/quicktips.less | 5 +----
resources/assets/less/metager/result-page.less | 8 +++-----
resources/assets/less/metager/result.less | 13 ++-----------
resources/assets/less/metager/variables.less | 4 ++--
5 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/app/Models/Result.php b/app/Models/Result.php
index 81b887750..a06f327f9 100644
--- a/app/Models/Result.php
+++ b/app/Models/Result.php
@@ -71,7 +71,7 @@ class Result
private function price_to_text($price)
{
- $euros = $price / 100;
+ $euros = floor($price / 100);
$cents = $price % 100;
$price_text = $euros . ',';
if ($cents < 10) {
@@ -284,7 +284,7 @@ class Result
strpos($this->strippedHost, "www.ladenpreis.net") === false &&
strpos($this->strippedHost, "ncbi.nlm.nih.gov") === false &&
strpos($this->strippedHost, "www.onenewspage.com") === false &&
- $this->gefVon !== "Shopzilla" ){
+ $this->gefVon !== "Shopzilla") {
$count = $metager->getHostCount($this->strippedHost);
if ($count >= 3) {
return false;
diff --git a/resources/assets/less/metager/quicktips.less b/resources/assets/less/metager/quicktips.less
index 5cf61d72f..991cadb89 100644
--- a/resources/assets/less/metager/quicktips.less
+++ b/resources/assets/less/metager/quicktips.less
@@ -87,9 +87,7 @@
}
&[type=spruch] {
order: 0;
- border-left: 3px solid #070;
p {
- color: #070;
display: flex;
flex-direction: column;
text-align: justify;
@@ -126,7 +124,6 @@
order: 6;
border: none;
box-shadow: none;
- color: #ff8000;
background-color: inherit;
.quicktip-summary {
display: flex;
@@ -139,7 +136,7 @@
margin: 5px;
.spendenaufruf-btn {
color: white;
- background-color: #ff8000;
+ background-color: @link-color;
font-size: 16px;
}
}
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index de6313feb..8979eddce 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -11,11 +11,9 @@
//
@result-page-body-background-color: @background-color;
@result-page-a-hover-color: red;
-@result-page-a-visited-color: @metager-orange;
@result-page-product-shop-color: green;
//
@body-background-color: @result-page-body-background-color;
-@a-visited-color: @result-page-a-visited-color;
@a-hover-color: @result-page-a-hover-color;
@a-donation-hover-color: @result-page-a-hover-color;
@product-shop-color: @result-page-product-shop-color;
@@ -162,7 +160,7 @@ nav .input-group {
a {
&:visited {
- color: @a-visited-color;
+ color: @link-color;
}
&:hover {
text-decoration: none;
@@ -510,8 +508,8 @@ a {
color: black;
}
&.active>a {
- border-bottom: 1px solid @metager-orange;
- color: @metager-orange;
+ border-bottom: 1px solid black;
+ color: black;
}
&:last-child {
padding-right: 20px
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index 079458a66..357493466 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -21,7 +21,7 @@
.result-price {
padding: 0px 10px;
color: white;
- background-color: #ff8000;
+ background-color: #666699;
border-radius: 3px;
}
a {
@@ -108,15 +108,7 @@
&>*:not(:first-child) {
margin-left: 20px;
}
- .result-open {
- &,
- &:active,
- &:hover,
- &:focus,
- &:visited {
- color: #ff8000;
- }
- }
+ .result-open,
.result-open-newtab {
&,
&:active,
@@ -127,7 +119,6 @@
font-size: @result-font-small;
text-decoration: none;
}
- margin-left: 25px;
}
@media (max-width: 499px) {
.result-open-newtab {
diff --git a/resources/assets/less/metager/variables.less b/resources/assets/less/metager/variables.less
index ba9529a07..44974ea0a 100644
--- a/resources/assets/less/metager/variables.less
+++ b/resources/assets/less/metager/variables.less
@@ -1,5 +1,5 @@
// MetaGer Brand Color
-@metager-orange: rgb(255, 128, 0);
+@metager-orange: #FF8000;
// General Colors
@color-white: white;
@color-almost-white: mix(@color-white, @color-black, 90%);
@@ -24,7 +24,7 @@ Helvetica,
Arial,
sans-serif;
// General textual link color.
-@link-color: @metager-orange;
+@link-color: #0066CC;
//
@padding-small-default: 8px;
/* Unsorted */
--
GitLab