Skip to content
Snippets Groups Projects
Commit 7a07795d authored by wyl's avatar wyl
Browse files

Merge branch 'C23096663' of https://git.cardiff.ac.uk/c23096663/myteam into C23096663

parents 5b04c227 f03243af
No related branches found
No related tags found
1 merge request!9C23096663 submit final
Hide whitespace changes
Inline Side-by-side
css/aboutus.css deleted 100644 → 0
+ 0
− 44
View file @ 5b04c227
.introduce img{
float: left;
margin-right: 56px;
}
.introduce h3{
float: left;
padding-bottom: 34px;
color: #666668;
font-weight: normal;
}
.introduce p{
float: right;
width: 730px;
line-height: 30px;
color: #666668;
}
.mission{
height: 80px;
padding-bottom: 34px;
}
.mission p{
text-align: center;
line-height: 80px;
color: #343233;
}
.photo img{
margin-bottom: 34px;
}
.photo ul{
margin-left: -59px;
}
.photo ul li{
float: left;
margin-left:59px;
}
.photo p{
padding-top: 32px;
padding-bottom: 54px;
text-align: center;
}
.bottom{
margin-top: 114px;
}
css/advantage.css deleted 100644 → 0
+ 0
− 3
View file @ 5b04c227
.bottom{
margin-top: 102px;
}
\ No newline at end of file
css/serve.css deleted 100644 → 0
+ 0
− 17
View file @ 5b04c227
.main li{
margin-bottom: 30px;
}
.main ul li h3{
font-weight: normal;
font-size:12px;
line-height: 30px;
}
.main ul li p{
font-size:12px;
color: #666666;
}
.import p{
color: #ff575a;
font-size: 12px;
line-height: 30px;
}
\ No newline at end of file
html/index.html deleted 100644 → 0
+ 0
− 88
View file @ 5b04c227
<!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">
<link rel="stylesheet" href="../css/email.css">
<link rel="stylesheet" href="../css/common.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>
<div class="top1">
</div>
<div >
<table id="etable">
<thead>
<td class="head" style="width: 204px;">name</td>
<td class="head" style="width: 176px;">club</td>
<td class="head" style="width: 190px;">address</td>
<td class="head">updatetime</td>
</thead>
<tbody>
<tr>
<td>run</td>
<td>outside</td>
<td>guerrillamail.com/zh/</td>
<td>2024-10-10</td>
</tr>
<tr>
<td>run</td>
<td>outside</td>
<td>guerrillamail.com/zh/</td>
<td>2024-10-10</td>
</tr>
<tr>
<td>run</td>
<td>outside</td>
<td>guerrillamail.com/zh/</td>
<td>2024-10-10</td>
</tr>
<tr>
<td>run</td>
<td>outside</td>
<td>guerrillamail.com/zh/</td>
<td>2024-10-10</td>
</tr>
<tr>
<td>run</td>
<td>outside</td>
<td>guerrillamail.com/zh/</td>
<td>2024-10-10</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment