Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 3041:841545c01ce9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
higawari3
author Minoru Konno <c113069@e.koeki-u.ac.jp>
date Tue, 15 Dec 2015 18:59:49 +0900
parents 83e8fdc8a0c3 (current diff) 4a74e40a1ea9 (diff)
children c1d99941e220
files
diffstat 13 files changed, 69 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
Binary file shuzai/fishing/fishing0.JPG has changed
Binary file shuzai/fishing/fishing10.JPG has changed
Binary file shuzai/fishing/fishing11.JPG has changed
Binary file shuzai/fishing/fishing3.JPG has changed
Binary file shuzai/fishing/fishing4(2).JPG has changed
Binary file shuzai/fishing/fishing4.JPG has changed
Binary file shuzai/fishing/fishing5.JPG has changed
Binary file shuzai/fishing/fishing6.JPG has changed
Binary file shuzai/fishing/fishing7.JPG has changed
Binary file shuzai/fishing/fishing8.JPG has changed
Binary file shuzai/fishing/fishing9.JPG has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shuzai/higawari/niwatori.html	Tue Dec 15 18:59:49 2015 +0900
@@ -0,0 +1,41 @@
+<html>
+<head>
+<title>日替わりランチ</title>
+<meta http-equiv="Content-Type" content="text/html; charset=Euc-jp">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+<link rel="stylesheet" type="text/css"href="../../skip.css">
+<link rel="stylesheet" type="text/css" href="higawari.css">
+</head>
+<!--以上設定等-->
+
+
+<body>
+<h1>店名 カフェテリア（東北公益文科大学）</h1>
+<h2>！気まぐれランチは月曜日から金曜日までの提供になります！</h2>
+<p><img src="kimagure.jpg"alt="鶏ののっけご飯"width=500""hight=360""></p>
+<p>12月14日(月)〜12月18日(金)の気まぐれランチ</p>
+<li>鶏ののっけご飯</li>
+<li>学生 400円(税込)</li>
+<li>一般 600円(税込)</li>
+</div>
+<!--お店情報-->
+
+<div class="tizu">
+<div id="map">
+<p>
+<iframe src="https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d12421.336897132342!2d139.8192108!3d38.8934717!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0x1f463cd5dde0f644!2z5p2x5YyX5YWs55uK5paH56eR5aSn5a2mIOOCq-ODleOCp-ODhuODquOCog!5e0!3m2!1sja!2sjp!4v1450172649295" width="600" height="400" frameborder="0" style="border:0" allowfullscreen></iframe>
+<!--地図上で表示-->
+</p>
+<p>住所:山形県酒田市飯森山3丁目5-1</p>
+<p>Tel:0234-41-1390</p>
+<p>営業時間:AM11:00~PM19:00</p>
+<p>定休日:無休(大学行事により休み有)</p>
+</div>
+</div>
+<!--場所情報-->
+
+<p><a href="higawari.html">戻る</a></p>
+
+</body>
+</html>
--- a/shuzai/tokusan/kudamono.html	Tue Dec 15 18:58:37 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 18:59:49 2015 +0900
@@ -16,15 +16,43 @@
 <div class="iconmenu">
 <!--登録店舗一覧の枠-->
 
+<<<<<<< local
+<div><p>ぶどう[スチューベン]</p><p><a href="budou.html"><img
+src="budou_i.jpg"alt="ぶどう[スチューベ
+ン]"width="150"hight="100"></a></p></div>
+=======
 <div><p>ぶどう[スチューベン]</p><p><a href="budou.html"><img src="budou_i.jpg"alt="ぶどう[スチューベン]"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>庄内柿</p><p><a href="kaki.html"><img src="kaki_i.jpg"alt="ぶど
+う"width="150"hight="100"></a></p></div>
+=======
 <div><p>庄内柿</p><p><a href="kaki.html"><img src="kaki_i.jpg"alt="ぶどう"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>庄内砂丘メロン</p><p><a
+href="meron.html"><img
+src="meron_i.jpg"alt=""width="150"hight="100"></a></p></div>
+=======
 <div><p>庄内砂丘メロン</p><p><a href="meron.html"><img src="meron_i.jpg"alt=""width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>梨</p><p><a href="nashi.html"><img
+src="nashi_i.jpg"alt="梨"width="150"hight="100"></a></p></div>
+=======
 <div><p>梨</p><p><a href="nashi.html"><img src="nashi_i.jpg"alt="梨"width="150"hight="100"></a></p></div>
+>>>>>>> other
 
+<<<<<<< local
+<div><p>リンゴ</p><p><a
+href="ringo.html"><img
+src="ringo_i.jpg"alt=""width="150"hight="100"></a></p></div>
+=======
 <div><p>リンゴ</p><p><a href="ringo.html"><img src="ringo_i.jpg"alt=""width="150"hight="100"></a></p></div>
+>>>>>>> other
 
 <div><p><img src=""alt=""width=""hight=""></p></div>

yatex.org