Merge branch 'master' of https://git.etud.insa-toulouse.fr/rees/progWeb
This commit is contained in:
commit
c14a27d115
3 changed files with 31 additions and 11 deletions
21
food_lifestyle.html
Normal file
21
food_lifestyle.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Food and Lifestyle</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<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</a>
|
||||||
|
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
||||||
|
<a href = "faq.html">Frequently Asked Questions</a>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body class="A">
|
<body class="A">
|
||||||
<header class="B">
|
<header>
|
||||||
<nav>
|
<nav class="B">
|
||||||
<a href>Main Page</a>
|
<a href = "main.html">Main Page</a>
|
||||||
<a href>Where To Go</a>
|
<a href = "where_to_go.html">Where To Go</a>
|
||||||
<a href>History</a>
|
<a href = "history_mythology.html">History and Mythology</a>
|
||||||
<a href>Food and Lifestyle</a>
|
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
||||||
<a href>Frequently Asked Questions</a>
|
<a href = "faq.html">Frequently Asked Questions</a>
|
||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
|
@ -56,7 +56,6 @@
|
||||||
<p id = "Greece"><b>New Greece</b></p>
|
<p id = "Greece"><b>New Greece</b></p>
|
||||||
<p>Britain, France and Russia wanted Greece to become a monarchy as well. They sent a prince that became the king of Greece in 1833. </p>
|
<p>Britain, France and Russia wanted Greece to become a monarchy as well. They sent a prince that became the king of Greece in 1833. </p>
|
||||||
<p>Greece became a republic in 1924. In 1940, the Italians invaded Greece but they were quickly pushed back.</p>
|
<p>Greece became a republic in 1924. In 1940, the Italians invaded Greece but they were quickly pushed back.</p>
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
<nav class="B">
|
<nav class="B">
|
||||||
<a href = "main.html">Main Page</a>
|
<a href = "main.html">Main Page</a>
|
||||||
<a href = "where_to_go.html">Where To Go</a>
|
<a href = "where_to_go.html">Where To Go</a>
|
||||||
<a href = "history_mythology.html">History</a>
|
<a href = "history_mythology.html">History and Mythology</a>
|
||||||
<a href>Food and Lifestyle</a>
|
<a href = "food_lifestyle.html">Food and Lifestyle</a>
|
||||||
<a href = "faq.html">Frequently Asked Questions</a>
|
<a href = "faq.html">Frequently Asked Questions</a>
|
||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
|
|
Loading…
Reference in a new issue