Commit 033c55ce authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '899-implement-new-metager-logo' of...

Merge branch '899-implement-new-metager-logo' of https://gitlab.metager3.de/open-source/MetaGer into 899-implement-new-metager-logo
parents 524eb325 240b48e5
<?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>
<?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>
......@@ -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',
......
......@@ -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
......@@ -15,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>
......@@ -24,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>
<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>
<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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment