Merge branch 'master' of https://git.etud.insa-toulouse.fr/rees/progWeb
This commit is contained in:
commit
1dba218a0e
4 changed files with 105 additions and 8 deletions
|
@ -10,6 +10,12 @@
|
|||
|
||||
}
|
||||
|
||||
footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
text-align: justify;
|
||||
color: wheat;
|
||||
}
|
||||
|
||||
div {
|
||||
height: 50px;
|
||||
|
|
2
faq.html
2
faq.html
|
@ -15,7 +15,7 @@
|
|||
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
||||
<a href = "faq.html">Frequently Asked Questions</a>
|
||||
</nav>
|
||||
</header>
|
||||
</header>
|
||||
<ol>
|
||||
<li>
|
||||
<h4>How do I get to Greece ?</h4>
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
<li><a href="#Mythology">Mythology</a></li>
|
||||
<ul>
|
||||
<li> <a href="#Introduction2">Introduction</a></li>
|
||||
<li> <a href="#Gods">Gods and Goddesses</a></li>
|
||||
|
||||
|
||||
</ul>
|
||||
|
@ -61,13 +61,104 @@
|
|||
|
||||
<section>
|
||||
<h1 id = "Mythology">Mythology</h1>
|
||||
|
||||
|
||||
<article>
|
||||
<p id = "Greece"><b>New Greece</b></p>
|
||||
|
||||
<p id = "Gods"><b>Gods and Goddesses</b></p>
|
||||
|
||||
<table border="1">
|
||||
<thead>
|
||||
<tr>
|
||||
<th rowspan="2">Category</th>
|
||||
<th rowspan="2">Name</th>
|
||||
<th colspan="2">Characteristics</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Gender</th>
|
||||
<th>Activity</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td rowspan="12">Olympian Gods</td>
|
||||
<td>Zeus</td>
|
||||
<td>Male</td>
|
||||
<td>God of the Gods</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Poseidon</td>
|
||||
<td>Male</td>
|
||||
<td>Sea, Horses</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hades</td>
|
||||
<td>Male</td>
|
||||
<td>Underworld</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Ares</td>
|
||||
<td>Male</td>
|
||||
<td>War, Weapons</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hera</td>
|
||||
<td>Female</td>
|
||||
<td>Marriage, Women, Family</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Apollo</td>
|
||||
<td>Male</td>
|
||||
<td>Sun, Music, Poetry, Healing</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Artemis</td>
|
||||
<td>Female</td>
|
||||
<td>Hunt, Wilderness</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Athena</td>
|
||||
<td>Female</td>
|
||||
<td>Wisdom, Military Victory</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Aphrodite</td>
|
||||
<td>Female</td>
|
||||
<td>Beauty, Love</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hephaestus</td>
|
||||
<td>Male</td>
|
||||
<td>Fire, Blacksmiths, Crafstmen </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hermes</td>
|
||||
<td>Male</td>
|
||||
<td>Herald of the Gods, Proctector of Thieves, Orators and Travellers</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Dionysus</td>
|
||||
<td>Male</td>
|
||||
<td>Wine, Insanity</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="3">Other Major Gods</td>
|
||||
<td>Demeter</td>
|
||||
<td>Female</td>
|
||||
<td>Agriculture</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Hestia</td>
|
||||
<td>Female</td>
|
||||
<td>Home, Hearth</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Persephone</td>
|
||||
<td>Female</td>
|
||||
<td>Spring, Queen of Underworld</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</article>
|
||||
|
||||
|
||||
<img src="./photos/titanomachy.jpg" alt="titanomachy" width="2000px"/>
|
||||
</section>
|
||||
|
||||
|
|
|
@ -2,12 +2,11 @@
|
|||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
|
||||
<link rel="stylesheet" href="css/text.css">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<nav class="B">
|
||||
<nav class ="B">
|
||||
<a href = "main.html">Main Page</a>
|
||||
<a href = "where_to_go.html">Where To Go</a>
|
||||
<a href = "history_mythology.html">History and Mythology</a>
|
||||
|
@ -22,6 +21,7 @@
|
|||
</article>
|
||||
</section>
|
||||
</main>-->
|
||||
<hr>
|
||||
<footer>
|
||||
<p>© Copyright 2022 by 3MIC. All Rights Reserved</p>
|
||||
</footer>
|
||||
|
|
Loading…
Reference in a new issue