Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1141:5accb5463fc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author SUZUKI Naoyuki <c111086@g.koeki-u.ac.jp>
date Tue, 01 Dec 2015 19:20:25 +0900
parents cb33eacdbb7b (current diff) 824a9e18493b (diff)
children d0c7387188c5
files syuzai/fishing/fishing.html syuzai/zoo/tsuruoka.html
diffstat 5 files changed, 63 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/fishing/fishing.html	Tue Nov 24 19:35:18 2015 +0900
+++ b/syuzai/fishing/fishing.html	Tue Dec 01 19:20:25 2015 +0900
@@ -157,7 +157,7 @@
 <p>酒田港屈指のアジ釣りポイント！シーズンになると多くの人が訪れ</p>
 <p>週末になると車を止めるのにも一苦労です。</p>
 
-<a href =>netくわしい地図を見る</a>
+<a href =http://maps.gsi.go.jp/#18/38.926556/139.811314>netくわしい地図を見る</a>
 
 <h2>住所</h2>
 <p>山形県酒田市</p>
@@ -175,7 +175,7 @@
 <p>すぐ近くに海鮮丼屋さんもあり、釣具屋さんもあるのでほんとに便利な</p>
 <p>釣り場となっています。</p>
 
-<a href =>netくわしい地図を見る</a>
+<a href =http://maps.gsi.go.jp/#17/38.914244/139.829543>netくわしい地図を見る</a>
 
 <h2>住所</h2>
 <p>山形県酒田市</p>
@@ -191,7 +191,7 @@
 <p>週末になると多くの人が訪れ、車を一度止めると出られなくなってしまう</p>
 <p>ほどです。駐車の際はお気をつけて。</p>
 
-<a href =>netくわしい地図を見る</a>
+<a href =http://maps.gsi.go.jp/#15/38.906296/139.830551>netくわしい地図を見る</a>
 
 <h2>住所</h2>
 <p>山形県酒田市</p>
--- a/syuzai/higawari/higawari3.html	Tue Nov 24 19:35:18 2015 +0900
+++ b/syuzai/higawari/higawari3.html	Tue Dec 01 19:20:25 2015 +0900
@@ -17,7 +17,7 @@
 <body>
 <h1>珈琲貴族</h1>
 
-<p><img src="kizoku.jpg"alt="(塩又は正油)ラーメンにとろろめし"></p>
+<p><img src="kizoku1.jpg"alt="(塩又は正油)ラーメンにとろろめし"></p>
 <!--img src="画像"alt="題名">
 
 <li>(塩又は正油)ラーメンにとろろめし</li>
Binary file syuzai/higawari/kizoku1.jpg has changed
--- a/syuzai/ijyuu.html	Tue Nov 24 19:35:18 2015 +0900
+++ b/syuzai/ijyuu.html	Tue Dec 01 19:20:25 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>
--- a/syuzai/zoo/tsuruoka.html	Tue Nov 24 19:35:18 2015 +0900
+++ b/syuzai/zoo/tsuruoka.html	Tue Dec 01 19:20:25 2015 +0900
@@ -1,6 +1,23 @@
+<<<<<<< local
+<<<<<<< local
+=======
+=======
+>>>>>>> other
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 5 Transitional//EN">
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 <html>
 <head>
+<<<<<<< local
+<<<<<<< local
+<title>鶴岡</title>
+<link rel="stylesheet" type="text/css" href="./skip.css">
+<style type="text.css">
+=======
+=======
+>>>>>>> other
 <title>
 </title>
 <meta http-equiv="content-type" content="text/html; charset=euc-jp">
@@ -14,9 +31,39 @@
 
 
 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 
 <!--
+<<<<<<< local
+<<<<<<< local
+
+=======
+=======
+>>>>>>> other
 藏翫押絽
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 -->
+<<<<<<< local
+<<<<<<< local
+
+</style>
+
+</head>
+
+<body>
+<h1>鶴岡の生き物達</h1>
+<tr>
+<th><img src="DSC02727.JPG" width="300" height="200"></a></th>
+</tr>
+=======
+>>>>>>> other
+=======
+>>>>>>> other
 </body>
 </html>

yatex.org