# HG changeset patch
# User ISHIKAWA MAI <c113017@e.koeki-u.ac.jp>
# Date 1450172941 -32400
# Node ID 083e7b148752142c594754ded1a89e450888168e
# Parent  369ad48d126a8e9a0bc08bbf81350369a90de971# Parent  af2f1f8d2e001106bdeea74f278f71b81701e3d4
merged

diff -r 369ad48d126a -r 083e7b148752 shuzai/higawari/base.html
--- a/shuzai/higawari/base.html	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/higawari/base.html	Tue Dec 15 18:49:01 2015 +0900
@@ -8,7 +8,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="sub.css">
 
 </head>
 <!--以上設定等-->
diff -r 369ad48d126a -r 083e7b148752 shuzai/higawari/higawari.html
--- a/shuzai/higawari/higawari.html	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/higawari/higawari.html	Tue Dec 15 18:49:01 2015 +0900
@@ -23,7 +23,7 @@
 <div><p>味噌ラーメン</p><p><a href="higawari2.html"><img src="ramen2.jpg"alt="味噌ラーメン"width="150"hight="100"></a></p></div>
 <div><p>鶏ののっけご飯　フルーツポンチ付き</p><p><a href="niwatori.html"><img src="kimagure.jpg"alt=""width="150"hight="100"></a></p></div>
 <div><p>ブタキムチ</p><p><a href="butakimuchi.html"><img src="donmono.jpg"alt="ブタキムチ"width="150"hight="100"></a></p></div>
-<div><p>白身魚のフライ　~イタリアン~</p><p><a href="shiromizakananofurai.html"><img src="teishoku.jpg"alt=""width="150"hight="100"></a></p></div>
+<div><p>白身魚のフライ　~イタリアン~</p><p><a href="shiromizakananofurai.html"><img src="teisyoku.jpg"alt=""width="150"hight="100"></a></p></div>
 <div><p><img src=""alt=""width=""hight=""></p></div>
 
 </div>
diff -r 369ad48d126a -r 083e7b148752 shuzai/higawari/main.css
--- a/shuzai/higawari/main.css	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/higawari/main.css	Tue Dec 15 18:49:01 2015 +0900
@@ -17,39 +17,6 @@
 
 a:hover{background-color: red;}
 
-div.menu{
-	width: 80%;
-	text-align: left;
-	background-color:;
-	border: solid #ff9900 5px;
-	}
-
-div.info1{
-	width: 800px;
-	min-height: 800px;
-	text-align: left;
-	padding: px;
-	float: left;
-	}
-
-div.tizu{
-	background-color: #ffd355;
-	border: solid #ff9900 5px;
-	margin-width: 100px;
-	padding: 10px;}
-
-div.info2{
-	width: 800px;
-	min-height: 800px;
-	padding: ;
-	float:;
-	}
-
-#map {
-  width: 600px;
-  height: 400px;
-  }
-
 div.image{
 	width: 1500px;
 	margin: 10px;
diff -r 369ad48d126a -r 083e7b148752 shuzai/higawari/shiromizakananofurai.jpg
Binary file shuzai/higawari/shiromizakananofurai.jpg has changed
diff -r 369ad48d126a -r 083e7b148752 shuzai/tokusan/kudamono.html
--- a/shuzai/tokusan/kudamono.html	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 18:49:01 2015 +0900
@@ -13,35 +13,22 @@
 <h2>画像クリックで詳細がご覧いただけます。</h2>
 
 
-<div class="left">
-<p>ぶどう[スチューベン]</p>
-<p><a href="budou.html"><img src="budou_i.jpg" width="150" height="100"></a></p></div>
-
+<div class="iconmenu">
+<!--登録店舗一覧の枠-->
 
-<div class="left">
-<p>庄内柿</p>
-<p><a href="kaki.html"><img src="kaki_i.jpg" width="150" height="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>
 
-
-<div class="left">
-<p>庄内砂丘メロン</p>
-<p><a href="meron.html"><img src="meron_i.jpg" width="150" height="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>
 
+<div><p>庄内砂丘メロン</p><p><a href="meron.html"><img src="meron_i.jpg"alt=""width="150"hight="100"></a></p></div>
 
-<div class="left">
-<p>梨</p>
-<p><a href="nashi.html"><img src="nashi_i.jpg" width="150" height="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>
 
-<div class="left">
-<p>リンゴ</p>
-<p><a href="ringo.html"><img src="ringo2_i.jpg" width="150" height="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>
 
+<div><p><img src=""alt=""width=""hight=""></p></div>
 
-<div class="left">
-<p>イチゴ</p>
-<p><a href="ichigo.html"><img src="ichigo_i.jpg" width="150" height="100"></a></p></div>
+</div>
 
 
 </body>
diff -r 369ad48d126a -r 083e7b148752 shuzai/tokusan/tokusan.css
--- a/shuzai/tokusan/tokusan.css	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/tokusan/tokusan.css	Tue Dec 15 18:49:01 2015 +0900
@@ -1,5 +1,5 @@
 
-body{background: #ccffff;}
+body{background: #feffcf;}
 
 h1{background: white; 
    color: #ff0000;
diff -r 369ad48d126a -r 083e7b148752 shuzai/tokusan/tokusan.html
--- a/shuzai/tokusan/tokusan.html	Tue Dec 15 18:39:20 2015 +0900
+++ b/shuzai/tokusan/tokusan.html	Tue Dec 15 18:49:01 2015 +0900
@@ -68,9 +68,6 @@
 <p>TEL：0234 41 0283</p>
 <p>営業時間：9時（冬季8時30分）~18時（冬季17時30分）</p>
 
-<p><iframe
- src="http://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d338.8741087,139.8273287,17z/data=!3m1!4b1!4m2!3m1!1s0x5f8c2012551eaff1:0xfe5a18a901a52207"width="600"
- height="450" frameborder="0" style="border:0"allowfullscreen></iframe></p>
 
 
 
diff -r 369ad48d126a -r 083e7b148752 shuzai/tokusan/tokusan.html.orig
--- a/shuzai/tokusan/tokusan.html.orig	Tue Dec 15 18:39:20 2015 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>特産物</title>
-<link rel="stylesheet" type="text/css" href="kagetsu.css">
-</head>
-
-<body>
-<h1>庄内の特産物を紹介するよ!</h1>
-<h2>取材レポート</h2>
-
-<h3>産直「いちご畑」に取材に行ってきました!</h3>
-
-<p>写真をあげまーす</p>
-
-
-
-<h1><img src="akanegimiso.jpg"></h1>
-<h1><img src="babaroa.jpg"></h1>
-<h1><img src="IMG_20151003_164841.jpg"></h1>
-<h1><img src="IMG_20151003_164909.jpg"></h1>
-<h1><img src="IMG_20151003_164921.jpg"></h1>
-<h1><img src="IMG_20151003_164943.jpg"></h1>
-<h1><img src="IMG_20151003_164956.jpg"></h1>
-<h1><img src="IMG_20151003_165014.jpg"></h1>
-<h1><img src="IMG_20151003_165039.jpg"></h1>
-<h1><img src="IMG_20151003_165052.jpg"></h1>
-<h1><img src="IMG_20151003_165058.jpg"></h1>
-<h1><img src="IMG_20151003_165104.jpg"></h1>
-<h1><img src="IMG_20151003_165109.jpg"></h1>
-<h1><img src="IMG_20151003_165113.jpg"></h1>
-<h1><img src="IMG_20151003_165123.jpg"></h1>
-<h1><img src="IMG_20151003_165129.jpg"></h1>
-<h1><img src="IMG_20151003_165135.jpg"></h1>
-<h1><img src="IMG_20151003_165147.jpg"></h1>
-<h1><img src="IMG_20151003_165151.jpg"></h1>
-<h1><img src="IMG_20151003_165209.jpg"></h1>
-<h1><img src="IMG_20151003_165223.jpg"></h1>
-<h1><img src="IMG_20151003_165240.jpg"></h1>
-<h1><img src="IMG_20151003_165251.jpg"></h1>
-<h1><img src="IMG_20151003_165255.jpg"></h1>
-<h1><img src="IMG_20151003_165344.jpg"></h1>
-<h1><img src="IMG_20151003_165350.jpg"></h1>
-<h1><img src="IMG_20151003_165354.jpg"></h1>
-<h1><img src="IMG_20151003_165359.jpg"></h1>
-<h1><img src="IMG_20151003_165410.jpg"></h1>
-<h1><img src="IMG_20151003_165416.jpg"></h1>
-<h1><img src="IMG_20151003_165424.jpg"></h1>
-<h1><img src="IMG_20151003_165430.jpg"></h1>
-<h1><img src="IMG_20151003_165444.jpg"></h1>
-<h1><img src="IMG_20151003_165448.jpg"></h1>
-<h1><img src="IMG_20151003_165506.jpg"></h1>
-<h1><img src="IMG_20151003_165511.jpg"></h1>
-<h1><img src=""></h1>
-<h1><img src=""></h1>
-<h1><img src=""></h1>
-<h1><img src=""></h1>
-<h1>おもしろい物がたくさんあったよ!みんな行ってみてね!</h1>
-
-</body>
-</html>
diff -r 369ad48d126a -r 083e7b148752 shuzai/tokusan/tokusanlogo.png
Binary file shuzai/tokusan/tokusanlogo.png has changed