Merge branch 'HaoyuSun' into 'main'

Update 3 files See merge request !7

Merge branch 'HaoyuSun' into 'main'
Update 3 files See merge request !7
4603a4e4 · Yulong Wang · 633d2ca7 · 176211eb · 4603a4e4 · 4603a4e4
Commit 4603a4e4 authored 7 months ago by Yulong Wang
--- a/Extreme Ironing/css/index.css
+++ b/Extreme Ironing/css/index.css
+.top {
+    background: #fefefe;
+}
+.title {
+    width: 130px;
+    height: 75px;
+    margin: 23px 0;
+    background-color: #f75a53;
+    color: yellow;
+}
+.saying img {
+    margin: 36px 24px 33px 39px;
+}
+.saying2 {
+    width: 300px;
+    height: 39px;
+    margin-top: 20px;
+}
+.saying2 p {
+    font-size: 14px;
+    color: #989a99;
+    font-style: italic;
+    line-height: 2;
+}
+.nav1 li {
+    padding: 30px 16px;
+    color: #000100;
+    float: left;
+    margin-top: 30px;
+}
+.nav1 li:hover {
+    background-color: #f75a53;
+    color: #fdfde3;
+}
\ No newline at end of file
--- a/Extreme Ironing/css/reset.css
+++ b/Extreme Ironing/css/reset.css
+*{
+    margin: 0;
+    padding: 0;
+    line-height: 1;
+}
+a{
+    text-decoration: none;
+}
+li{
+    list-style: none;
+}
+img{
+    vertical-align: middle;
+    border: none;
+}
+.clearfix:after{
+    content: "";
+    display: block;
+    clear: both;
+    height:0 ;
+    overflow: hidden;
+    visibility: hidden;
+}
+.safe{
+    width: 1140px;
+    margin: 0 auto;
+}
+.left{
+    float: left;
+}
+.right{
+    float: right;
+}
\ No newline at end of file
--- a/Extreme Ironing/html/index.html
+++ b/Extreme Ironing/html/index.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <link rel="stylesheet" href="../css/reset.css">
+    <link rel="stylesheet" href="../css/index.css">
+</head>
+<body>
+    <div class="top safe">
+        <!-- title -->
+        <div class="title left">
+            <h1>Extreme Ironing</h1>
+        </div>
+        <div class="saying left">
+            <img src="../image/l.gif" alt="渐变竖线">
+        </div>
+        <div class="saying2 left">
+            <p>Extreme ironing (also called EI) is an extreme sport in which people take ironing boards to remote
+                locations and iron items of clothing. </p>
+        </div>
+        <!-- nav -->
+        <div class="nav1 right">
+            <ul>
+                <li>index</li>
+                <li>about us</li>
+                <li>news</li>
+                <li>order us</li>
+                <li>contact us</li>
+                <li>ask us</li>
+                <li>contact us</li>
+            </ul>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
--- a/myteam.txt
+++ b/myteam.txt
-Haoyu Sun
+Haoyu Sun test1
 Yulong Wang
 Yibo Zhu
 Zhicheng Xu
\ No newline at end of file