changeset 2958:5e6c16419e4e

merge
author ARAKI Tsuyohito <c113007@e.koeki-u.ac.jp>
date Fri, 11 Dec 2015 11:30:49 +0900
parents 4a936fa07e15 (current diff) 8bd658f58680 (diff)
children 48566cf9944a
files
diffstat 2 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/shuzai/higawari/higawari.css	Fri Dec 11 11:30:31 2015 +0900
+++ b/shuzai/higawari/higawari.css	Fri Dec 11 11:30:49 2015 +0900
@@ -37,18 +37,15 @@
 div.image{
 	width: 100%;
 	margin: 0;
-	padding: 0;}
+	padding: 1000px;}
 
-div.pic1 {margin: 10px;
-	 padding: 0px;
+div.pic1 {
+	 width: 180px;
+	 padding: 15px;
 	 float: left;
-	 width: 120px;
-	 height: 80px;
+	 width: 180px;
+	 texit-align: center;
+	 min-height: 180px; /*width/heightは微調整する*/
 	 }
 
-div.pic2 {margin: 10px;
-	 padding: 50px;
-	 float: right;
-	 width: 120px;
-	 height: 80px;}
-
+div.iconmenu div p {padding: 0; margin: 0;}
--- a/shuzai/higawari/higawari.html	Fri Dec 11 11:30:31 2015 +0900
+++ b/shuzai/higawari/higawari.html	Fri Dec 11 11:30:49 2015 +0900
@@ -21,10 +21,12 @@
 
 <div class="pic1">
 <p>֤ͤȥΥ꡼ѥ</p><p><a href="moare.html"><img
-src="negisamon.jpg"alt="֤ͤȥΥ꡼"width="150"hight="100"></a></p>
-<p>̣顼</p><p><a href="higawari2.html"><img src="ramen2.jpg"alt="̣顼"width="150"hight="100"></a></p>
-<p>饤</p><p><a href="omurice.html"><img src="kimagure.jpg"alt="
-ϥ䥷饤"width="150"hight="100"></a></p><p>ĻЧ</p><p><a href="donmono.html"><img src="donmono.jpg"alt="ޡܡЧ"width="150"hight="100"></a></p><p>ΤΤ󤫤</p><p><img src="sake.jpg"alt=""width="150"hight="100"></p><p><img src=""alt=""width=""hight=""></p></div>
+src="negisamon.jpg"alt="֤ͤȥΥ꡼"width="150"hight="100"></a></p></div>
+<div class="pic1"><p>̣顼</p><p><a href="higawari2.html"><img src="ramen2.jpg"alt="̣顼"width="150"hight="100"></a></p></div>
+<div class="pic1"><p>饤</p><p><a href="omurice.html"><img src="kimagure.jpg"alt="ϥ䥷饤"width="150"hight="100"></a></p></div>
+<div class="pic1"><p>ĻЧ</p><p><a href="donmono.html"><img src="donmono.jpg"alt="ޡܡЧ"width="150"hight="100"></a></p></div>
+<div class="pic1"><p>ΤΤ󤫤</p><p><img src="sake.jpg"alt=""width="150"hight="100"></p></div>
+<div class="pic1"><p><img src=""alt=""width=""hight=""></p></div>
 
 </div>
 

yatex.org