Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
0838e06d
Commit
0838e06d
authored
Jul 27, 2018
by
Karl Hasselbring
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Orange als Farbe größtenteils entfernt
parent
35a89605
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
24 deletions
+10
-24
app/Models/Result.php
app/Models/Result.php
+2
-2
resources/assets/less/metager/quicktips.less
resources/assets/less/metager/quicktips.less
+1
-4
resources/assets/less/metager/result-page.less
resources/assets/less/metager/result-page.less
+3
-5
resources/assets/less/metager/result.less
resources/assets/less/metager/result.less
+2
-11
resources/assets/less/metager/variables.less
resources/assets/less/metager/variables.less
+2
-2
No files found.
app/Models/Result.php
View file @
0838e06d
...
...
@@ -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
;
...
...
resources/assets/less/metager/quicktips.less
View file @
0838e06d
...
...
@@ -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;
}
}
...
...
resources/assets/less/metager/result-page.less
View file @
0838e06d
...
...
@@ -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
...
...
resources/assets/less/metager/result.less
View file @
0838e06d
...
...
@@ -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 {
...
...
resources/assets/less/metager/variables.less
View file @
0838e06d
// 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 */
...
...
Karl Hasselbring
@karl
mentioned in issue
#755 (closed)
·
Aug 10, 2018
mentioned in issue
#755 (closed)
mentioned in issue #755
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment