Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1220:4d76d50bcb17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author ARAKI Tsuyohito <c113007@e.koeki-u.ac.jp>
date Tue, 08 Dec 2015 19:38:29 +0900
parents f7446f05f276 (diff) c750c1dd7d91 (current diff)
children f2d8741b5fa8
files
diffstat 16 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/shuzai/ijuu.html	Tue Dec 08 19:37:56 2015 +0900
+++ b/shuzai/ijuu.html	Tue Dec 08 19:38:29 2015 +0900
@@ -28,7 +28,7 @@
 <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>
+<td><a href="fishing/fishing.html">釣り情報</a></td></tr>
 </table>
 </div>
 </div>
@@ -37,7 +37,7 @@
 <p><a href=https://skip.koeki-prj.org/>home</a> > <a href="syuzai.html">
 取材</a> > 移住情報</p>
 
-<div class="label"><table style="margin:auto;"><tr>
+<div class="label"><table class="label"><tr>
 <td><label for="label-1">施設について</label></td>
 <td><label for="label-2">酒田の地域性</label></td>
 <td><label for="label-3">酒田の気候</label></td>
--- a/shuzai/main.css	Tue Dec 08 19:37:56 2015 +0900
+++ b/shuzai/main.css	Tue Dec 08 19:38:29 2015 +0900
@@ -21,6 +21,9 @@
 }
 div.label label:hover{background:pink;}
 
+table.label{margin:auto;}
+table.label td{padding:0 1em;}
+
 div.toi{border-top:navy 1px solid;;}
 input[type="checkbox"] + label + div.toi{height:0em; opacity:0;
 transition: 0.3s ease-in-out;}
Binary file shuzai/tokusan/akanegimiso_i.jpg has changed
Binary file shuzai/tokusan/akebi_i.jpg has changed
Binary file shuzai/tokusan/babaroa_i.jpg has changed
--- a/shuzai/tokusan/budou.html	Tue Dec 08 19:37:56 2015 +0900
+++ b/shuzai/tokusan/budou.html	Tue Dec 08 19:38:29 2015 +0900
@@ -14,8 +14,7 @@
 <p>
 （収穫時期：9月~12月）<br>
 スチューベンの特徴はなんといっても糖度の高さで、20度以上にもなるものもあります。酸が少なく、蜂蜜のような濃い甘さでとっても美味です。<br>
-保存方法：ハサミで房から枝を少し残して切る。タッパーに入れて、冷蔵庫で保
-存する\。食べる時はさっと洗って食べる。</p>
+保存方法：ハサミで房から枝を少し残して切る。タッパーに入れて、冷蔵庫で保存する。食べる時はさっと洗って食べる。</p>
 
 <p><img src="budou2.jpg"></p>
 
Binary file shuzai/tokusan/budou_i.jpg has changed
Binary file shuzai/tokusan/ichigo_i.jpg has changed
Binary file shuzai/tokusan/ingen_i.jpg has changed
Binary file shuzai/tokusan/kaki_i.jpg has changed
--- a/shuzai/tokusan/kudamono.html	Tue Dec 08 19:37:56 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 08 19:38:29 2015 +0900
@@ -13,7 +13,7 @@
 
 <div class="left">
 <p>ぶどう[スチューベン]</p>
-<p><a href="budou.html"><img src="tokusan/budou.jpg" width="150" height="100"></a></p>
+<p><a href="budou.html"><img src="budou_i.jpg" width="150" height="100"></a></p>
 
 
 
Binary file shuzai/tokusan/meron_i.jpg has changed
Binary file shuzai/tokusan/nashi_i.jpg has changed
Binary file shuzai/tokusan/ringo2_i.jpg has changed
Binary file shuzai/tokusan/tomatojamu2_i.jpg has changed
Binary file shuzai/tokusan/tsukemono_i.jpg has changed

yatex.org