Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1079:63573c9e4c26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
yellow
author OOTANI Hiroyuki <c115036@g.koeki-u.ac.jp>
date Tue, 24 Nov 2015 19:23:46 +0900
parents 6de9d9a056ae
children 824a9e18493b
files syuzai/ijyuu.html
diffstat 1 files changed, 12 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/ijyuu.html	Tue Nov 24 18:55:58 2015 +0900
+++ b/syuzai/ijyuu.html	Tue Nov 24 19:23:46 2015 +0900
@@ -8,58 +8,43 @@
 <link rel="stylesheet" type="text/css"href="./main.css">
 <style type="text/css">
 <!--
-<<<<<<< local
 div + h1{padding-top:2em;}
-=======
->>>>>>> other
+div.menu table td {
+    width:7em;
+    text-align:center;
+}
 -->
 </style>
-<<<<<<< local
+
 <script type="text/javascript">
 <!--
 var doc = document.documentElement;
 doc.setAttribute('data-useragemt',navigator.userAgent);
 -->
 </script>
-=======
->>>>>>> other
+
 </head>
-<<<<<<< local
-=======
-<body>
-<h1>取材一覧</h1>
 
->>>>>>> other
-
-<<<<<<< local
 <body>
 
 <div class="fix">
 <div class="menu">
 <table style="border-collapse: collapse; margin-left:
  auto; margin-right: auto;">
- <tr><td><a href="../">top</a></td><td><a href="syuzai.html">取材</a></td><td><a href="../program/program.html">プログラム
- </a></td><td><a href="../enq/enq.html">アンケート</a></td><td><a href="../kiraribito/girl.html">きらりびと</a></td></tr>
+ <tr><td><a href="syuzai.html">取材</a></td>
+<td><a href="rupo/rupo.html">もぐもぐ</a></td>
+<td><a href="zoo/index.html">動物園</a></td>
+<td><a href="higawari/higawari.html">日替わりランチ</a></td>
+<td><a href="tokusan/tokusan.html">特産物</a></td>
+<td><a href="dezima/dezima.html">釣り情報</a></td></tr>
 </table>
 </div>
 </div>
 
 <h1>酒田市移住Q&A</h1>
-=======
->>>>>>> other
 
 
 
-<table>
-<tr><th>もぐもぐ</th><th>移住情報</th><th>動物園</th><th>日替わりランチ
- </th><th>特産物</th><th>釣り情報</th>
-<tr><th><a href="rupo/rupo.html"><img
-     src="rupo/rupo1-150.jpg"></a></th><th><a href="./ijyuu.html"><img src="iturn/i20091123-1450-00.jpg" width="150" height="100"></a></th>
-
-<th><a href="zoo/index.html"><img src="zoo/domon_a.jpg" width="150" height="100"></a></th><th><a href="higawari/higawari.html"><img src="higawari/higawari.jpg"></a></th>
-<th><a href="tokusan/tokusan.html"><img src="tokusan/tokusan_top.jpg" width="150" height="100"></a></th><th><a href="dezima/dezima.html"><img src="dezima/dezima4-150.JPG"></a></th></tr></tr>
-
-</table>
 <header><img src="image/sakataiju.png"></header>
 <form>
 <label>

yatex.org