Commit 42de6667 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '25-replace-fontawesome' into 'master'

Resolve "Replace FontAwesome"

Closes #25

See merge request open-source/metager-app!12
parents e84dfa8e f146325b
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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"
id="svg8"
version="1.1"
viewBox="0 0 26.458333 26.458334"
height="100"
width="100">
<defs
id="defs2" />
<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
transform="translate(0,-270.54165)"
id="layer1">
<circle
r="8.1427841"
cy="280.53705"
cx="10.104252"
id="path18"
style="fill:#ffffff;stroke:#1a1a1a;stroke-width:3.51560855;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:0" />
<rect
ry="0.52354032"
transform="rotate(-45)"
y="213.11421"
x="-193.34026"
height="13.393704"
width="4.0934591"
id="rect4498"
style="fill:#1a1a1a;fill-opacity:1;stroke:#000000;stroke-width:0.79342139;stroke-miterlimit:4;stroke-dasharray:0, 8.7276353;stroke-dashoffset:0" />
</g>
</svg>
......@@ -6,7 +6,6 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
<link rel="stylesheet" type="text/css" href="style/index.css" />
<link rel="stylesheet" href="style/material-default.css"/>
<link href="style/font-awesome.min.css" rel="stylesheet"/>
<title>MetaGer</title>
<script type="text/javascript" async="defer" src="cordova.js"></script>
<script type="text/javascript" defer="defer" src="app/index.js"></script>
......@@ -21,7 +20,7 @@
<img src="img/Logo-square-inverted.svg" alt="MetaGer" title="MetaGer, die sichere Suchmaschine"/>
</a>
<input type="text" id="search-input" name="eingabe" placeholder="MetaGer-Suche" class="query-input"/>
<button type="submit" class="search-button fa"></button>
<button type="submit" class="search-button"><img src="img/search.svg" alt="Suchen"/></button>
</form>
<footer class="footer-text">
MetaGer wird entwickelt und betrieben vom SUMA-EV - Verein für freien Wissenszugang. Version 3.0.3.
......
......@@ -6,7 +6,6 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
<link rel="stylesheet" type="text/css" href="style/index.css" />
<link rel="stylesheet" href="style/material-default.css"/>
<link href="style/font-awesome.min.css" rel="stylesheet"/>
<title>MetaGer</title>
<script type="text/javascript" async="defer" src="cordova.js"></script>
<script type="text/javascript" defer="defer" src="app/results.js"></script>
......@@ -19,7 +18,7 @@
<img src="img/Logo-square-inverted.svg" alt="MetaGer" title="MetaGer, die sichere Suchmaschine"/>
</a>
<input type="text" name="eingabe" placeholder="MetaGer-Suche" value="" class="query-input" disabled="disabled"/>
<button type="submit" class="search-button fa"></button>
<button type="submit" class="search-button"><img src="img/search.svg" alt="Suchen"/></button>
</form>
</header>
<main class="results-container">
......
This diff is collapsed.
......@@ -71,7 +71,7 @@ input:focus {
border: none;
background: none;
margin: 0px;
padding: 0px;
padding: 5px 0px;
}
.search-card input[type=text] {
......@@ -89,7 +89,7 @@ input:focus {
}
.search-button img {
height: 100%;
height: 20px;
}
.search-card .back img {
......
......@@ -19,7 +19,7 @@
<img src="img/Logo-square-inverted.svg" alt="MetaGer" title="MetaGer, die sichere Suchmaschine"/>
</a>
<input type="text" name="eingabe" placeholder="MetaGer-Suche" value="{opensearch:Query[@role='request']/@searchTerms}" class="query-input"/>
<button type="submit" class="search-button fa"></button>
<button type="submit" class="search-button"><img src="img/search.svg" alt="Suchen"/></button>
</form>
</header>
<main class="results-container">
......
Supports Markdown
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