Merge branch '899-implement-new-metager-logo' into 'development'

Resolve "Implement new MetaGer Logo"

Closes #899

See merge request !1460

public/img/metager-schloss-orange.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="99.168" height="106.51" version="1.1" viewBox="0 0 99.167999 106.51305" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g transform="matrix(1.3333 0 0 -1.3333 -373.81 107.43)"><g transform="scale(.1)"><path d="m2828 805.72v-230.32h69.31c27.25 0 40.87 14.426 40.87 42.879v78.789h345.86c101.01 0 151.51-53.668 151.51-157.63v-85.7h-497.37l0.01-52.015c0-28.313-13.75-42.871-40.87-42.871h-93.81v-140.79c0-140.79 70.4-211.19 212.72-211.19h281.59c165.27 0 249.45 85.699 249.45 255.57v287.7c0 169.87-84.18 255.57-249.45 255.57zm289.79-446.87h74.76c50.36 0 69.52-25.856 69.52-74.098v-112.79c0-38.305-19.21-58.168-56.76-58.168h-38.57c-32.53 0-48.95 19.25-48.95 57.465v187.59" fill="#f47216"/></g></g></svg>

public/img/metager-schloss.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="45" height="20" version="1.1" viewBox="0 0 99.167999 106.51305" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g transform="matrix(1.3333 0 0 -1.3333 -373.81 107.43)"><g transform="scale(.1)"><path d="m2828 805.72v-230.32h69.31c27.25 0 40.87 14.426 40.87 42.879v78.789h345.86c101.01 0 151.51-53.668 151.51-157.63v-85.7h-497.37l0.01-52.015c0-28.313-13.75-42.871-40.87-42.871h-93.81v-140.79c0-140.79 70.4-211.19 212.72-211.19h281.59c165.27 0 249.45 85.699 249.45 255.57v287.7c0 169.87-84.18 255.57-249.45 255.57zm289.79-446.87h74.76c50.36 0 69.52-25.856 69.52-74.098v-112.79c0-38.305-19.21-58.168-56.76-58.168h-38.57c-32.53 0-48.95 19.25-48.95 57.465v187.59" fill="#00000"/></g></g></svg>

public/img/metager.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="813.33" height="142.67" version="1.1" viewBox="0 0 813.33331 142.66667" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g transform="matrix(1.3333 0 0 -1.3333 0 142.67)"><g transform="scale(.1)" fill="#f47216"><path d="m8.1133 805.72v-798.85h110.19v688.66h422.38v-688.66h107.12v688.66h264.75c104.06 0 156.1-55.09 156.1-163.75v-524.91h111.71v543.28c0 169.87-82.64 255.57-246.39 255.57h-925.87"/><path d="m2074.1 6.8711v108.66h-456.05c-101 0-151.5 53.563-151.5 157.63v273.93c0 108.65 52.04 149.98 156.1 149.98h243.32c82.64 0 125.49-41.32 125.49-122.43v-15.305c0-70.391-41.32-105.59-123.96-105.59h-325.14v-94.886l354.22 3e-3c136.2 0 202.01 59.692 202.01 177.53v58.152c0 140.78-70.4 211.18-212.72 211.18h-281.59c-165.28 0-249.45-85.699-249.45-255.57v-287.7c0-169.87 84.17-255.57 249.45-255.57h469.82"/><path d="m2654.1 115.53h-21.53c-98.36 0-148.88 50.86-151.4 149.73v431.81h172.93v108.65h-172.93v73.277h0.16v112.79c0 48.231-19.15 74.091-69.52 74.091h-42.19v-113.38h-0.17v-146.78h-149.97v-108.65h149.97v-146.92l-0.1 3e-3v-287.7c0-3.265 0.04-6.492 0.1-9.695v-19.105h0.77c9.22-150.7 92.92-226.77 248.57-226.77h35.31v108.66"/><path d="m2828 805.72v-230.32h69.31c27.25 0 40.87 14.426 40.87 42.879v78.789h345.86c101.01 0 151.51-53.668 151.51-157.63v-85.7h-497.37l0.01-52.015c0-28.313-13.75-42.871-40.87-42.871h-93.81v-140.79c0-140.79 70.4-211.19 212.72-211.19h281.59c165.27 0 249.45 85.699 249.45 255.57v287.7c0 169.87-84.18 255.57-249.45 255.57zm289.79-446.87h74.76c50.36 0 69.52-25.856 69.52-74.098v-112.79c0-38.305-19.21-58.168-56.76-58.168h-38.57c-32.53 0-48.95 19.25-48.95 57.465v187.59"/><path d="m3966.6 1065.9c-166.8 0-249.45-84.169-249.45-254.03l0.01-550.94c0-169.86 82.64-254.04 249.45-254.04h344.33c149.97 0 224.96 74.988 224.96 226.5v342.03h-425.45v-94.878h316.79v-225.73c0-93.34-45.92-139.26-139.26-139.26h-299.95c-102.52 0-154.56 52.028-154.56 157.62l-0.01 520.33c0 105.6 52.03 157.62 154.57 157.62h521.85v114.78h-543.28"/><path d="m5875 805.72c-166.81 0-249.45-85.699-249.45-255.82v-543.02h111.72v524.66c0 108.91 53.56 164 157.62 164h195.89v110.19h-215.78"/><path d="m5426.6 6.8711v108.66h-456.05c-101 0-151.5 53.563-151.5 157.63v273.93c0 108.65 52.03 149.98 156.09 149.98h243.33c82.64 0 125.49-41.32 125.49-122.43v-15.305c0-70.391-41.32-105.59-123.96-105.59h-325.14v-94.886l354.22 3e-3c136.2 0 202.01 59.692 202.01 177.53v58.152c0 140.78-70.4 211.18-212.72 211.18h-281.59c-165.28 0-249.45-85.699-249.45-255.57v-287.7c0-169.87 84.17-255.57 249.45-255.57h469.82"/></g></g></svg>

public/img/rainbow.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="45"
+   height="20"
+   viewBox="0 0 100 50"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="rainbows.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <circle
+       style="fill:#ce2026;fill-opacity:1;stroke:none"
+       id="path850"
+       cx="50"
+       cy="50"
+       r="40" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path851"
+       cx="50"
+       cy="50"
+       r="32" />
+    <circle
+       style="fill:#ffd600;fill-opacity:1;stroke:none"
+       id="path852"
+       cx="50"
+       cy="50"
+       r="30" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path853"
+       cx="50"
+       cy="50"
+       r="22" />
+    <circle
+       style="fill:#00a888;fill-opacity:1;stroke:none"
+       id="path853"
+       cx="50"
+       cy="50"
+       r="20" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path854"
+       cx="50"
+       cy="50"
+       r="12" />
+  </g>
+</svg>

resources/lang/de/index.php

@@ -28,13 +28,13 @@ return [
     'focus-creator.focusname' => 'Suchname: ',
 
     'about.1.1' => "Garantierte Privatsphäre",
-    'about.1.2' => 'Mit uns behalten Sie die volle Kontrolle über Ihre Daten.',
-    'about.2.1' => 'Gemeinnütziger Verein',
-    'about.2.2' => 'Wir als SUMA-EV sind unabhängig, weil wir keine kommerziellen Interessen verfolgen!',
-    'about.3.1' => 'Unterstützen & Spenden',
-    'about.3.2' => 'Mit Ihrer Spende unterstützen Sie die Arbeit des SUMA-EV und den Betrieb von MetaGer.',
-    'about.4.1' => 'Machen Sie mit!',
-    'about.4.2' => 'Stärken Sie uns, indem Sie Mitglied im Trägerverein werden.',
+    'about.1.2' => 'Mit uns behalten Sie die volle Kontrolle über Ihre Daten. Wir speichern nicht.',
+    'about.2.1' => 'Vielfältig & Frei',
+    'about.2.2' => 'MetaGer schützt gegen Zensur, indem es Ergebnisse vieler Suchmaschinen kombiniert. Unser Quellcode ist frei lizensiert und offen.',
+    'about.3.1' => '100% Ökostrom',
+    'about.3.2' => 'Alle unsere Dienste sind mit Strom aus regenerativen Energiequellen betrieben. Nachhaltig und sauber.',
+    'about.4.1' => 'Gemeinnütziger Verein',
+    'about.4.2' => 'Unterstützen Sie MetaGer, indem Sie spenden oder Mitglied im gemeinnützigen Trägerverein werden.',
 
     'lang.tooltip' => 'Ergebnissprache wählen',
     'key.placeholder' => 'Mitglieder-Key eingeben',

resources/less/metager/general/general.less

@@ -175,6 +175,9 @@ i.fa {
         @media(max-width: @screen-mobile) {
             font-size: 2em;
         }
+        >img {
+            width: 4.8em;
+        }
     }
 }
 

resources/less/metager/pages/resultpage/result-page.less

@@ -32,6 +32,9 @@
         margin: 0px;
         font-size: 1.5em;
         display: inline-block;
+        > img {
+            width: 100px;
+        }
     }
     .screen-small {
         display: none;
@@ -42,6 +45,9 @@
         }
         .screen-small {
             display: initial;
+            img {
+                width: 20px;
+            }
         }
     }
 }

resources/less/metager/pages/start-page.less

@@ -45,47 +45,58 @@
 
 .startpage #main-content {
     justify-content: center;
-        #about-us {
-            font-size: 1.4em;
-            color: #777;
-            text-align: center;
-            margin-top: 60px;
-            width: 100%;
-            top: 100vh;
-            position: absolute;
-            @media(min-width: 520px){
-                top: inherit;
-                bottom: 100px;
-                position: inherit;
-            }
-            > div {
-                display: flex;
-                flex-wrap: wrap;
-                justify-content: center;
-                margin: 24px 0;
-                > a {
-                    &:nth-child(1){
-                        @media(min-width: 520px){
-                            margin-right: 24px;
-                        }
-                    }
-                    @media(max-width: 520px){
-                        &:nth-child(2){
-                            margin-top: 24px;
-                        }
-                    }
-                    display: flex;
-                    flex-direction: column;
-                    cursor: pointer;
-                    color: inherit;
-                    width: 240px;
-                    > div.teaser {
-                        font-size: .7em;
+    #about-us {
+        font-size: 1.4em;
+        color: #777;
+        text-align: center;
+        margin-top: 60px;
+        width: 100%;
+        top: 100vh;
+        position: absolute;
+        @media(min-width: 520px){
+            top: inherit;
+            bottom: 100px;
+            position: inherit;
+        }
+        > div {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
+            margin: 24px 0;
+            > a {
+                &:nth-child(1){
+                    @media(min-width: 520px){
+                        margin-right: 24px;
                     }
-                    &:hover > div.teaser {
-                        visibility: inherit;
+                }
+                @media(max-width: 520px){
+                    &:nth-child(2){
+                        margin-top: 24px;
                     }
                 }
+                display: flex;
+                flex-direction: column;
+                cursor: pointer;
+                color: inherit;
+                width: 240px;
+                > div.teaser {
+                    font-size: .7em;
+                    text-align: justify;
+                    hyphens: auto;
+                }
+                &:hover > div.teaser {
+                    visibility: inherit;
+                }
             }
         }
+        #gradient {
+            background-image: linear-gradient( red, yellow);
+            color:transparent;
+            -webkit-background-clip: text;
+            background-clip: text;
+        }
+        #green-leaf {
+            color: green;
+        }
+    }
 }
\ No newline at end of file

resources/less/metager/parts/searchbar.less

@@ -48,7 +48,7 @@
             justify-content: center;
             align-items: center;
             > a {
-                padding: 8px 16px;
+                padding: 5px 16px 0px 16px;
                 color: #777;
                 &.authorized {
                     color:green;

resources/less/metager/parts/sidebar.less

@@ -15,7 +15,18 @@
     transition: 0.5s;
     border-left: none;
     .sidebar-logo {
-        margin-bottom: 20px;
+        > span {
+            display: block;
+            margin: 20px;
+            background-color: #ff7f00;
+            padding: 10px 0;
+            text-align: center;
+            border-radius: 10px;
+            >img {
+                width: 10em;
+                filter: brightness(0) invert(1);
+            }
+        }
     }
     .sidebar-list {
         padding-left: 0;

resources/views/index.blade.php

@@ -4,7 +4,9 @@
 
 @section('content')
 	<h1 id="startpage-logo">
-		<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a>
+		<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
+			<img src="/img/metager.svg" alt="MetaGer" />
+		</a>
 	</h1>
 	@include('parts.searchbar', ['class' => 'startpage-searchbar'])
 	<div id="plugin-btn-div">
@@ -13,7 +15,7 @@
 		<div id="about-us">
 			<div class="m-row">
 				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "about") }}">
-					<i class="fas fa-user-secret"></i>
+					<img alt="lock" src="/img/metager-schloss.svg">
 					<span>@lang('index.about.1.1')</span>
 					<div class="teaser">@lang('index.about.1.2')</div>
 				</a>
@@ -22,19 +24,19 @@
 				@else
 				<a href="https://suma-ev.de/en/index.html" target="_blank">
 				@endif
-					<i class="fas fa-heart"></i>
+					<img alt="rainbow" src="/img/rainbow.svg">
 					<span>@lang('index.about.2.1')</span>
 					<div class="teaser">@lang('index.about.2.2')</div>
 				</a>
 			</div>
 			<div class="m-row">
-				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "spende") }}">
-					<i class="fas fa-money-bill-wave"></i>
+				<a href="javascript:void(0);">
+					<i class="fas fa-leaf" id="green-leaf"></i>
 					<span>@lang('index.about.3.1')</span>
 					<div class="teaser">@lang('index.about.3.2')</div>
 				</a>
-				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "beitritt") }}">
-					<i class="fas fa-user-friends"></i>
+				<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "spende") }}">
+					<i class="fas fa-heart" id="gradient"></i>
 					<span>@lang('index.about.4.1')</span>
 					<div class="teaser">@lang('index.about.4.2')</div>
 				</a>

resources/views/layouts/researchandtabs.blade.php

@@ -4,10 +4,10 @@
 		<div id="research-bar">
 			<div id="header-logo">
 				<a class="screen-large" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="4">
-					<h1>MetaGer</h1>
+					<h1><img src="/img/metager.svg" alt="MetaGer" /></h1>
 				</a>
 				<a class="screen-small" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
-					<h1>M</h1>
+					<h1><img src="/img/metager-schloss-orange.svg" alt="MetaGer" /></h1>
 				</a>
 			</div>
 			<div id="header-searchbar">

resources/views/parts/sidebar.blade.php

 <input id="sidebarToggle" class="hidden" type="checkbox">
 <div class="sidebar">
   <a class="sidebar-logo" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
-    <p>MetaGer</p>
+    <span>
+      <img src="/img/metager.svg" alt="MetaGer"></img>
+    </span>
   </a>
   <ul class="sidebar-list">
     <li>