changeset 2053:618e632d85a2

merge
author TAGUCHI Ayae <c112093@h.koeki-u.ac.jp>
date Wed, 28 Aug 2013 05:18:33 +0900
parents 1776b29c27bb
children 10998a35742a
files index.html picture/ayae-100.jpg skip.css syuzai/minatoza.html syuzai/moare.html syuzai/nisimura.html syuzai/romantei.html syuzai/rupo.html syuzai/tukusi.html
diffstat 9 files changed, 181 insertions(+), 161 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/index.html	Wed Aug 28 05:18:33 2013 +0900
@@ -56,12 +56,19 @@
 <table style="border-collapse: collapse; margin-left:
  auto; margin-right: auto;">
  <tr>
-  <td><a href="http://skip.koeki-prj.org/staff/ayae/index.html">あやえ</a></td><td><a href="http://skip.koeki-prj.org/staff/kei/index.html">kei</a></td>
-  <td><a href="http://skip.koeki-prj.org/staff/masaki/index.html">村上</a></td><td><a href="http://skip.koeki-prj.org/staff/rina/index.html">rina&#9825;</a></td>
-  <td><a href="http://skip.koeki-prj.org/staff/oyamada/index.html">小山田</a></td><td><a href=http://skip.koeki-prj.org/staff/chokai/index.html">chokai</a></td>
- </tr>
+  <td><a href="staff/ayae/index.html"><img src="picture/ayae-100.jpg" alt="あやえ"></a></td>
+  <td><a href="staff/kei/index.html"><img src="picture/" alt="kei"></a></td>
+ <td><a href="staff/masaki/index.html"><img src="picture/" alt="村上"></a></td>
+<td><a href="staff/rina/index.html"><img src="picture/" alt="rina&#9825;"></a></td>
+<td><a href="staff/oyamada/index.html"><img src="picture/" alt="小山田"></a></td>
+<td><a href="staff/chokai/index.html"><img src="picture/" alt="chokai"></a></td>
+<td><a href="staff/yuuji/index.html"><img src="picture/" alt="yuuji"></a></td>
+
+</tr>
 </table>
 
+</div>
+
 <p>SKIPは、東北公益文科大学のほげほげがほげほげしながら、ほげほげしてい
 るほげほげです<br>
 そして、みなさんもほげほげなのです</p>
Binary file picture/ayae-100.jpg has changed
--- a/skip.css	Tue Aug 27 13:07:19 2013 +0900
+++ b/skip.css	Wed Aug 28 05:18:33 2013 +0900
@@ -123,3 +123,10 @@
     
 }
 
+/*X^bt@uO*/
+
+div.staff img{
+    border: 1px blue solid;
+    box-shadow: green 2px 2px 2px;
+    margin-right: 8px;
+}
\ No newline at end of file
--- a/syuzai/minatoza.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/minatoza.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,39 +1,40 @@
-<html>
-<head>
-<title>`</title>
-</head>
-
-<body>
-<p img src=""></p>
-<p img scr=""></p>
-<h1>`</h1>
-<p img scr=""></p>
-<div class="">
-<table>
-<tr><th><a href="">E|bgt[</a></th></tr>
-<tr><th><p img scr=""></p></th></tr>
-<tr><th><a href="">A</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">Q</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">yM</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">o</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">t[cf</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-</table>
-</div>
-<h2>j</h2>
-<p></p>
-<h2>`</h2>
-<p></p>
-<h2>IXXi</h2>
-<p></p>
-<p>Z</p>
-<p><br>
-</p>
-<p>db<br>
-</p>
-</body>
-</html>
+<html>
+<head>
+<title>港座</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
+</head>
+
+<body>
+<p img src=""></p>
+<p img scr=""></p>
+<h1>港座</h1>
+<p img scr=""></p>
+<div class="">
+<table>
+<tr><th><a href="">ル・ポットフー</a></th></tr>
+<tr><th><p img scr=""></p></th></tr>
+<tr><th><a href="">モアレ</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">浪漫亭</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">土筆</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">出島</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">フルーツデリにしむら</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+</table>
+</div>
+<h2>歴史</h2>
+<p></p>
+<h2>伝説</h2>
+<p></p>
+<h2>オススメ品</h2>
+<p></p>
+<p>住所</p>
+<p><br>
+</p>
+<p>電話番号<br>
+</p>
+</body>
+</html>
--- a/syuzai/moare.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/moare.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,39 +1,40 @@
-<html>
-<head>
-<title>A</title>
-</head>
-
-<body>
-<p img src=""></p>
-<p img scr=""></p>
-<h1>A</h1>
-<p img scr=""></p>
-<div class="">
-<table>
-<tr><th><a href="">E|bgt[</a></th></tr>
-<tr><th><p img scr=""></p></th></tr>
-<tr><th><a href="">Q</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">`</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">yM</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">o</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">t[cf</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-</table>
-</div>
-<h2>j</h2>
-<p></p>
-<h2>`</h2>
-<p></p>
-<h2>IXXi</h2>
-<p></p>
-<p>Z</p>
-<p><br>
-</p>
-<p>db<br>
-</p>
-</body>
-</html>
+<html>
+<head>
+<title>モアレ</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
+</head>
+
+<body>
+<p img src=""></p>
+<p img scr=""></p>
+<h1>モアレ</h1>
+<p img scr=""></p>
+<div class="">
+<table>
+<tr><th><a href="">ル・ポットフー</a></th></tr>
+<tr><th><p img scr=""></p></th></tr>
+<tr><th><a href="">浪漫亭</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">港座</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">土筆</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">出島</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">フルーツデリにしむら</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+</table>
+</div>
+<h2>歴史</h2>
+<p></p>
+<h2>伝説</h2>
+<p></p>
+<h2>オススメ品</h2>
+<p></p>
+<p>住所</p>
+<p><br>
+</p>
+<p>電話番号<br>
+</p>
+</body>
+</html>
--- a/syuzai/nisimura.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/nisimura.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,6 +1,7 @@
 <html>
 <head>
 <title>フルーツデリにしむら</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
 </head>
 
 <body>
--- a/syuzai/romantei.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/romantei.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,39 +1,40 @@
-<html>
-<head>
-<title>Q</title>
-</head>
-
-<body>
-<p img src=""></p>
-<p img scr=""></p>
-<h1>Q</h1>
-<p img scr=""></p>
-<div class="">
-<table>
-<tr><th><a href="">E|bgt[</a></th></tr>
-<tr><th><p img scr=""></p></th></tr>
-<tr><th><a href="">A</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">`</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">yM</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">o</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th><a href="">t[cf</a></th></tr>
-<tr><th><p img scr=""></th></tr>
-</table>
-</div>
-<h2>j</h2>
-<p></p>
-<h2>`</h2>
-<p></p>
-<h2>IXXi</h2>
-<p></p>
-<p>Z</p>
-<p><br>
-</p>
-<p>db<br>
-</p>
-</body>
-</html>
+<html>
+<head>
+<title>浪漫亭</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
+</head>
+
+<body>
+<p img src=""></p>
+<p img scr=""></p>
+<h1>浪漫亭</h1>
+<p img scr=""></p>
+<div class="">
+<table>
+<tr><th><a href="">ル・ポットフー</a></th></tr>
+<tr><th><p img scr=""></p></th></tr>
+<tr><th><a href="">モアレ</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">港座</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">土筆</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">出島</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th><a href="">フルーツデリにしむら</a></th></tr>
+<tr><th><p img scr=""></th></tr>
+</table>
+</div>
+<h2>歴史</h2>
+<p></p>
+<h2>伝説</h2>
+<p></p>
+<h2>オススメ品</h2>
+<p></p>
+<p>住所</p>
+<p><br>
+</p>
+<p>電話番号<br>
+</p>
+</body>
+</html>
--- a/syuzai/rupo.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/rupo.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,40 +1,41 @@
-<html>
-<head>
-<title>E|bgt[</title>
-</head>
-
-<body>
-<p img src=""></p>
-<p img scr=""></p>
-<h1>E|bgt[</h1>
-<p img scr=""></p>
-<div class="">
-<table>
-<tr><th>A</th></tr>
-<tr><th><p img scr=""></p></th></tr>
-<tr><th>Q</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>`</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>yM</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>o</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>t[cf</th></tr>
-<tr><th><p img scr=""></th></tr>
-</table>
-</div>
-<h2>j</h2>
-<p></p>
-<h2>`</h2>
-<p></p>
-<h2>IXXi</h2>
-<p></p>
-<p>Z</p>
-<p>998-0023<br>
-R`csK1-10-20 iJr3F</p>
-<p>db<br>
-0234-26-2218</p>
-</body>
-</html>
-
+<html>
+<head>
+<title>ル・ポットフー</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
+</head>
+
+<body>
+<p img src=""></p>
+<p img scr=""></p>
+<h1>ル・ポットフー</h1>
+<p img scr=""></p>
+<div class="">
+<table>
+<tr><th>モアレ</th></tr>
+<tr><th><p img scr=""></p></th></tr>
+<tr><th>浪漫亭</th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th>港座</th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th>土筆</th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th>出島</th></tr>
+<tr><th><p img scr=""></th></tr>
+<tr><th>フルーツデリにしむら</th></tr>
+<tr><th><p img scr=""></th></tr>
+</table>
+</div>
+<h2>歴史</h2>
+<p></p>
+<h2>伝説</h2>
+<p></p>
+<h2>オススメ品</h2>
+<p></p>
+<p>住所</p>
+<p>998-0023<br>
+山形県酒田市幸町1-10-20 日進開発ビル3F</p>
+<p>電話番号<br>
+0234-26-2218</p>
+</body>
+</html>
+
--- a/syuzai/tukusi.html	Tue Aug 27 13:07:19 2013 +0900
+++ b/syuzai/tukusi.html	Wed Aug 28 05:18:33 2013 +0900
@@ -1,6 +1,7 @@
 <html>
 <head>
 <title>土筆</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
 </head>
 
 <body>

yatex.org