Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 318:ae24525cfee9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
date Tue, 27 Aug 2013 13:07:19 +0900
parents 919492ad34a0
children 80586dce28a5
files skip.css syuzai.css syuzai.css~ syuzai/dezima.html
diffstat 4 files changed, 41 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/skip.css	Tue Aug 27 07:49:39 2013 +0900
+++ b/skip.css	Tue Aug 27 13:07:19 2013 +0900
@@ -19,6 +19,7 @@
 	text-align:right;
 	margin-top:2em;
 	margin-right:20px;
+	margin-left:1em;
 	width: 152px;
 	float:right;
 }
@@ -109,4 +110,16 @@
     border: 2px yellow solid;
     box-shadow: orange 3px 3px 3px;
 
-}
\ No newline at end of file
+}
+
+/*食べ物　取材*/
+
+div.syuzai_pic img{
+    border: 2px yellow solid;
+    box-shadow: orange 3px 3px 3px; 
+}
+
+h2{
+    
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai.css	Tue Aug 27 13:07:19 2013 +0900
@@ -0,0 +1,8 @@
+
+body{
+    background: #f9c013;
+}
+
+div.main{
+    background: white; border: 10px solid #fdea0f; padding: 1em; margin: 10px;
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai.css~	Tue Aug 27 13:07:19 2013 +0900
@@ -0,0 +1,8 @@
+
+body{
+    background: red;
+}
+
+div.main{
+    background: whit; border: 10px solid #f3a; padding: 1em; margin: 10px;
+}
\ No newline at end of file
--- a/syuzai/dezima.html	Tue Aug 27 07:49:39 2013 +0900
+++ b/syuzai/dezima.html	Tue Aug 27 13:07:19 2013 +0900
@@ -1,29 +1,18 @@
 <html>
 <head>
-<title>ｽﾐﾅ</title>
+<title>ｽﾐﾅ遑｡ｼ霄</title>
+<link rel="stylesheet" type="text/css" href="../syuzai.css">
 </head>
 
 <body>
-<p img src=""></p>
-<p img scr=""></p>
+
+<div class="main">
+
+<p><img src="../picture/dezima4-150.JPG"></p>
+
 <h1>ｽﾐﾅ</h1>
-<p img scr=""></p>
-<div class="">
-<table>
-<tr><th>･筵｢･</th></tr>
-<tr><th><p img scr=""></p></th></tr>
-<tr><th>ﾏｲﾌ｡ﾄ</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>ｹﾁｺﾂ</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>ﾅﾚﾉｮ</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>ｽﾐﾅ</th></tr>
-<tr><th><p img scr=""></th></tr>
-<tr><th>･ﾕ･｡ｼ･ﾄ･ﾇ･熙ﾋ､ｷ､爨</th></tr>
-<tr><th><p img scr=""></th></tr>
-</table>
-</div>
+
+
 <h2>ﾎｻﾋ</h2>
 <p>
 ﾁｰｿﾈ､ﾏ｡｢ﾊﾆﾉｶ､､ｷ､ﾐ､､ｿ､皃ﾎﾆ､ﾇ荀ｻﾅｻ､､ｷ､ﾆ､､､ｿ､ｽ､ｦ､ﾇ､ｹ｡｣<br>
@@ -44,6 +33,8 @@
 ｻｳｷﾁｸｩｼﾅﾄｻﾔﾃ貽ｮ2-1-12</p>
 <p>ﾅﾅﾏﾃﾈﾖｹ<br>
 0234-22-2449</p>
+
+<div>
 </body>
 </html>

yatex.org