rees/progWeb
0
0
分叉 0
程式碼 問題 合併請求 版本發布 Wiki 動態

Merge branch 'master' of https://git.etud.insa-toulouse.fr/rees/progWeb

瀏覽代碼
這個提交存在於：
Tizziana Mansy 2022-12-12 09:02:25 +01:00
當前提交 532d23adbc
共有 3 個檔案被更改，包括 31 行新增 和 12 行删除
顯示統計資料 下載補綴檔案 下載差異檔案 展開所有檔案 折疊所有檔案

21
food_lifestyle.html 一般檔案
查看文件

@ -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>

15
history_mythology.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>

5
main.html
查看文件

@ -6,13 +6,12 @@
<link rel="stylesheet" href="css/text.css"> <link rel="stylesheet" href="css/text.css">
</head> </head>
<body> <body>
<header> <header>
<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>