diff --git a/app/Models/Result.php b/app/Models/Result.php index 81b887750ea6f85c165c387b564644b67fc85c64..a06f327f9dbd994010d7915f3b798ef2b017e986 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 273b91d00eb395f4c20256560f9fc003938ad4f3..cbc93ec9fb52403dbc088c16fe56c20c13b3c1a2 100644 --- a/resources/assets/less/metager/quicktips.less +++ b/resources/assets/less/metager/quicktips.less @@ -89,7 +89,6 @@ order: 0; border: none; box-shadow: none; - color: #ff8000; background-color: inherit; .quicktip-summary { display: flex; @@ -102,7 +101,7 @@ margin: 5px; .spendenaufruf-btn { color: white; - background-color: #ff8000; + background-color: @link-color; font-size: 16px; } } @@ -110,9 +109,7 @@ } &[type=spruch] { order: 1; - border-left: 3px solid #070; p { - color: #070; display: flex; flex-direction: column; text-align: justify; diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less index de6313feb42498994c4033c059b4a6f36d03bcca..8979eddcea0b17e6c214b5a93f2fee383ad7f128 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 079458a66ca3142df88e3fd22e7696158db35490..3574934667f8d65d6bc6fad988a252fa90d66007 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 ba9529a07ae70c6a1589428557c483339b4ff9a8..44974ea0a3d41b1b2653355a72ba7e149ac7d3c7 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 */