Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 1299:9151bd0a34a7

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, 15 Dec 2015 18:55:36 +0900
parents e4b8ba922edd (current diff) c4e47ca3575c (diff)
children 183ac7f602b9
files shuzai/tokusan/kudamono.html
diffstat 6 files changed, 43 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/shuzai/higawari/base.html	Tue Dec 15 18:50:21 2015 +0900
+++ b/shuzai/higawari/base.html	Tue Dec 15 18:55:36 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>
 <!--以上設定等-->
--- a/shuzai/higawari/higawari.html	Tue Dec 15 18:50:21 2015 +0900
+++ b/shuzai/higawari/higawari.html	Tue Dec 15 18:55:36 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>
--- a/shuzai/higawari/main.css	Tue Dec 15 18:50:21 2015 +0900
+++ b/shuzai/higawari/main.css	Tue Dec 15 18:55:36 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;
Binary file shuzai/higawari/shiromizakananofurai.jpg has changed
--- a/shuzai/tokusan/kudamono.html	Tue Dec 15 18:50:21 2015 +0900
+++ b/shuzai/tokusan/kudamono.html	Tue Dec 15 18:55:36 2015 +0900
@@ -16,23 +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>
 
--- a/shuzai/tokusan/tyouri.html	Tue Dec 15 18:50:21 2015 +0900
+++ b/shuzai/tokusan/tyouri.html	Tue Dec 15 18:55:36 2015 +0900
@@ -14,31 +14,31 @@
 <body>
 <h1>庄内の特産物を使った料理を紹介します！</h1>
 
-<table>
-<tr>
-<th><p>赤ねぎ味噌</p></th>
-<th><p>苺のババロア</p></th>
-<th><p>漬け物</p></th>
-<th><p>トマトジャム</p></th>
-<th><p>あけびの鶏味噌炒め</p></th>
-<th><p>メロンジャム</p></th>
-
-<tr>
-<th><p><a href="akanegimiso.html"><img src="akanegimiso.jpg" width="150" height="100"></a></p></th>
+<div class="iconmenu">
+<!--登録店舗一覧の枠-->
 
-<th><p><a href="babaroa.html"><img src="babaroa.jpg" width="150" height="100"></a></p></th>
-
-<th><p><a href="tsukemono.html"><img src="tsukemono.jpg" width="150" height="100"></a></p></th>
-
-<th><p><a href="tomatojamu.html"><img src="tomatojamu2.jpg" width="150" height="100"></a></p></th>
+<div><p>赤ねぎ味噌</p><p><a href="akanegimiso.html"><img
+src="akanegimiso_i.jpg"alt="赤ねぎ味噌
+"width="150"hight="100"></a></p></div>
+<div><p>苺のババロア</p><p><a href="babaroa..html"><img
+src="babaroa_i.jpg"alt="ババロア"width="150"hight="100"></a></p></div>
+<div><p>漬け物</p><p><a
+href="tsukemono.html"><img
+src="tsukemono_i.jpg"alt="漬け物"width="150"hight="100"></a></p></div>
+<div><p>トマトジャム</p><p><a href="tomatojamu.html"><img
+src="tomatojamu2_i.jpg"alt="トマトジャム"width="150"hight="100"></a></p></div>
+<div><p>あけびの鶏味噌炒め</p><p><a
+href="akanegimiso.html"><img
+src="akanegimiso_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>
 
-<th><p><a href="kudamono_akebi.html"><img src="akebi.jpg" width="150"
-height="100"></a></p></th>
+<div><p><img src=""alt=""width=""hight=""></p></div>
+
 
-<th><p><a href="meron.html"><img src="meron.jpg" width="150"
-height="100"></a></p></th>
+</div>
 
-</table>
 
 </body>
 </html>

yatex.org