bitte verwendet nur noch addressen die https beginnen! Siehe wiki https://wiki.mediacube.at/wiki/index.php?title=Repositories#ssh-_vs._https_repository_adressen

alle von MMT haben hier Zugriff. Du willst Deine Freunde von MMA auch dabei haben? Mail mit den usernamen an Brigitte Jellinek

Commit 0d541faf authored by Daniel Witek's avatar Daniel Witek

merge conflict

parents 966d5555 f5809160
This diff is collapsed.
......@@ -3,41 +3,45 @@
<head>
<meta charset="UTF-8">
<title>Poke Dex Go</title>
<link rel="stylesheet" type="text/css" href="style.css">
<link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
</head>
<body>
<section class="top">
<h1 class="title"><p class="blue_dot"></p>Solr Pokédex</h1>
</section>
<section class="search">
<form class="searchForm" action="">
<h2>Search for a Pokémon!</h2>
<input id="input" name="q" type="text" class="formelement"/>
<section id="suggestions"></section>
<select name="type" id="type" class="formelement">
<option value="">-Pick a Type to Filter-</option>
<option value="Water">Water</option>
<option value="Fire">Fire</option>
<option value="Grass">Grass</option>
<option value="Poison">Poison</option>
<option value="Normal">Normal</option>
<option value="Electric">Electric</option>
<option value="Ice">Ice</option>
<option value="Fighting">Fighting</option>
<option value="Ground">Ground</option>
<option value="Flying">Flying</option>
<option value="Psychic">Psychic</option>
<option value="Bug">Bug</option>
<option value="Rock">Rock</option>
<option value="Ghost">Ghost</option>
<option value="Dragon">Dragon</option>
<option value="Dark">Dark</option>
<option value="Steel">Steel</option>
<option value="Fairy">Fairy</option>
</select>
<input id="input" name="q" type="text" />
<section id="suggestions">
</section>
<label><p>Filter by type:</p>
<select name="type" id="type">
<option value="">-Zum filtern auswählen-</option>
<option value="Water">Water</option>
<option value="Fire">Fire</option>
<option value="Grass">Grass</option>
<option value="Poison">Poison</option>
<option value="Normal">Normal</option>
<option value="Electric">Electric</option>
<option value="Ice">Ice</option>
<option value="Fighting">Fighting</option>
<option value="Ground">Ground</option>
<option value="Flying">Flying</option>
<option value="Psychic">Psychic</option>
<option value="Bug">Bug</option>
<option value="Rock">Rock</option>
<option value="Ghost">Ghost</option>
<option value="Dragon">Dragon</option>
<option value="Dark">Dark</option>
<option value="Steel">Steel</option>
<option value="Fairy">Fairy</option>
</select>
</label>
<button id="searchButton" type="submit" class="button">Send</button>
<button id="searchButton" type="submit" class="button formelement">Search</button>
</form>
</section>
......
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