Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 483:05a4ec7de2f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commited
author FUJIKAWA Kosuke <c111126@g.koeki-u.ac.jp>
date Wed, 12 Feb 2014 17:27:56 +0900
parents 7f9ea0116d9b (current diff) 3ed52802fafb (diff)
children 9ccb8ed4640b
files #index.html#
diffstat 10 files changed, 352 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/#index.html#	Wed Feb 12 17:27:13 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<html lang="ja">
-
-<head>
-<title>SKIP - Shonai Koeki Information Project</title>
-<link rel="stylesheet" type="text/css" href="skip.css">
-</head>
-
-<body>
-
-<div class="side_photo_right">
-<p><a href="syuzai/dezima.html">
-<img src="picture/dezima4-150.JPG" alt="dezima" width="" style="align: right;">
-</a></p>
-<p><a href="syuzai/nisimura.html">
-<img src="picture/nisimura1-150.JPG" alt="nisimura" width="" style="align: right;">
-</a></p>
-<p><a href="enq/ogawaen.html">
-<img src="picture/ogawaen1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="enq/pom.html">
-<img src="picture/pom3-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="index.html">
-<img src="picture/romantei2-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="url">
-<img src="picture/rupo1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="syuzai/tukusi.html">
-<img src="picture/tukusi1-150.JPG" alt="photo" width="" style="align: right;">
-</a></p>
-<p><a href="enq/als.html">
-<img src="picture/ars1-150.jpg" alt="photo" width="" style="align: right;">
-</a></p>
-</p>
-</div>
-
-<div class="fix">
-<div class="menu">
-<table style="border-collapse: collapse; margin-left:
- auto; margin-right: auto;">
- <tr><td><a href=".">top</a></td><td><a href="syuzai.html"><img src="" alt="取材"></a></td><td><a href="program.html">プログラム</a></td><td><a href="enq.html">アンケート</a></td></tr>
-</table>
-</div>
-</div>
-
-<div class="main_title">
-<img src="skip.png" alt="title logo"><img src="skip-kamo-small.png" alt="kamon">
-</div>
-
-<p class="new"><span>新着情報</span> </p>
-<div class="staff">
-<h3>
-☆STAFF☆
-</h3>
-<table style="border-collapse: collapse; margin-left:
- auto; margin-right: auto;">
- <tr>
-  <td><a href="http://skip.koeki-prj.org/staff/ayae/index.html">あやえ</a></td><td><a href="http://skip.koeki-prj.org/staff/kei/index.html">kei</a></td>
-  <td><a href="http://skip.koeki-prj.org/staff/masaki/index.html">村上</a></td><td><a href="http://skip.koeki-prj.org/staff/rina/index.html">rina&#9825;</a></td>
-  <td><a href="http://skip.koeki-prj.org/staff/oyamada/index.html">小山田</a></td><td><a href=http://skip.koeki-prj.org/staff/chokai/index.html">chokai</a></td>
- </tr>
-</table>
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/#marathon2013.html#	Wed Feb 12 17:27:56 2014 +0900
@@ -0,0 +1,54 @@
+<html lang="ja">
+<head>
+<title>酒田シティハーフマラソン</title>
+<link rel="stylesheet" type="text/css" href="skip.css">
+</head>
+
+<body>
+
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href=".">top</a></td><td><a href="syuzai.html"><img src=""
+ alt="取材"></a></td><td><a href="program.html">プログラム</a></td><td><a href="enq.html">アンケート</a></td><td><a href="girl.html"><img src="" alt="きらりびと"></a></td></tr>
+</table>
+</div>
+</div>
+
+<div class="main_title">
+<img src="skip-kamo-small.png" alt="kamon">
+</div>
+
+<div class="mara">
+<h1>酒田シティハーフマラソン </h1>
+
+<div class="map_nakamachi">
+<img src="nakamachi.png" alt="中町詳細マップ">
+</div>
+
+<p><a href="https://ja-jp.facebook.com/SWAN.PROJECT">SWAN　
+Project</a></p>
+
+<h2>スタンプラリーでお得なクーポンをスマホでゲット!</h2>
+
+<h3>スタンプラリー参加の事前準備</h3>
+<ol>
+<li>スマホの「Google play」もしくは「App Store」を開き、「フレッツ」で無料ア
+プリを検索します。</li>
+<li>「FLET'S WiFiアプリ」を無料ダウンロードをします。</li>
+<div class="img"><img src="downrad1.png" width="300" height="300"></div>
+<li>アプリを起動して、ユーザー登録をします。</li>
+</ol>
+<h3>酒田シティーハーフマラソンandどんしゃん祭り当日</h3>
+<p>スタンプラリー店舗に行って、スマホでスタンプを押していきます。</p>
+<div class="img_float">
+<div class="img"><img src="omise3.png" width="300" height="300"></div>
+<div class="img"><img src="kamonkun05.png" width="300" height="300"></div>
+</div>
+<p>それだけです!!</p>
+
+ <h2>スタンプを5個集めて、賞品交換所でお得なクーポンをゲットしましょう!</h2>
+</div>
+</body>
+</html>
--- a/event/marathon2013.html	Wed Feb 12 17:27:13 2014 +0900
+++ b/event/marathon2013.html	Wed Feb 12 17:27:56 2014 +0900
@@ -12,9 +12,7 @@
 <table style="border-collapse: collapse; margin-left:
  auto; margin-right: auto;">
  <tr><td><a href=".">top</a></td><td><a href="syuzai.html"><img src=""
-				  alt=""></a></td><td><a href="program.html">ץ
-						       </a></td><td><a href="enq.html">󥱡</a></td><td><a
-													   href="girl.html"><img src="" alt="Ӥ"></a></td></tr>
+ alt=""></a></td><td><a href="program.html">ץ</a></td><td><a href="enq.html">󥱡</a></td><td><a href="girl.html"><img src="" alt="Ӥ"></a></td></tr>
 </table>
 </div>
 </div>
@@ -25,6 +23,10 @@
 
 <div class="mara">
 <h1>ĥƥϡեޥ饽 </h1>
+
+<div class="map_nakamachi">
+<img src="nakamachi.png" alt="Įܺ٥ޥå">
+</div>
 <p><a href="https://ja-jp.facebook.com/SWAN.PROJECT">SWAN
 Project</a></p>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/event/marathon2013.html.orig	Wed Feb 12 17:27:56 2014 +0900
@@ -0,0 +1,73 @@
+<html lang="ja">
+<head>
+<title>ĥƥϡեޥ饽</title>
+<link rel="stylesheet" type="text/css" href="skip.css">
+</head>
+
+<body>
+
+
+<div class="fix">
+<div class="menu">
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href=".">top</a></td><td><a href="syuzai.html"><img src=""
+ alt=""></a></td><td><a href="program.html">ץ</a></td><td><a href="enq.html">󥱡</a></td><td><a href="girl.html"><img src="" alt="Ӥ"></a></td></tr>
+</table>
+</div>
+</div>
+
+<div class="main_title">
+<img src="skip-kamo-small.png" alt="kamon">
+</div>
+
+<div class="mara">
+<h1>ĥƥϡեޥ饽 </h1>
+
+<div class="map_nakamachi">
+<img src="nakamachi.png" alt="Įܺ٥ޥå">
+</div>
+<p><a href="https://ja-jp.facebook.com/SWAN.PROJECT">SWAN
+Project</a></p>
+
+<p>ˤʤ뤪Źο᤭Ф򥯥å</p>
+<div class="map">
+<img src="nakamachi_map.png" usemap="#map1">
+<map name="map1">
+ <area shape="rect" coords="191,173,309,223" href="syuzai/moare.html" alt="ե顼ȡ⥢">
+ <area shape="rect" coords="571,446,643,496" href="syuzai/butsudan_sato.html" alt="ʩŤκƣ">
+ <area shape="rect" coords="649,451,716,500" href="syuzai/kikuchi.html" alt="۾">
+ <area shape="rect" coords="676,514,750,565" href="syuzai/ichifuji.html" alt="Ʋٻ">
+ <area shape="rect" coords="462,451,529,498" href="syuzai/nishimura_naka.html" alt="˥ĮŹ">
+ <area shape="rect" coords="357,510,486,561" href="syuzai/.html" alt="եåե롼İƣ">
+ <area shape="rect" coords="503,133,620,183" href="syuzai/vege_nishimura.html" alt="Ρ䤵ˤ">
+ <area shape="rect" coords="424,130,499,178" href="syuzai/.html" alt="業ѥ">
+ <area shape="rect" coords="319,63,447,116" href="syuzai/oizumi.html" alt="򡦿ͷեȤ">
+ <area shape="rect" coords="319,129,396,177" href="syuzai/.html" alt="Įޥ륷">
+ <area shape="rect" coords="152,122,229,159" href="syuzai/.html" alt="굮²">
+ <area shape="rect" coords="5,47,183,116" href="syuzai/.html" alt="ե󥷡å¿">
+ <area shape="rect" coords="234,440,309,484" href="syuzai/.html" alt="̼">
+</map>
+</div>
+
+<h2>ץ꡼Ǥʥݥ򥹥ޥۤǥå!</h2>
+
+<h3>ץ꡼äλ</h3>
+<ol>
+<li>ޥۤΡGoogle playפ⤷ϡApp Storeפ򳫤֥եåġפ̵
+ץ򸡺ޤ</li>
+<li>FLET'S WiFiץפ̵ɤ򤷤ޤ</li>
+<div class="img"><img src="downrad1.png" width="300" height="300"></div>
+<li>ץươ桼Ͽ򤷤ޤ</li>
+</ol>
+<h3>ĥƥϡեޥ饽andɤ󤷤פ</h3>
+<p>ץ꡼Źޤ˹Ԥäơޥۤǥפ򲡤Ƥޤ</p>
+<div class="img_float">
+<div class="img"><img src="omise3.png" width="300" height="300"></div>
+<div class="img"><img src="kamonkun05.png" width="300" height="300"></div>
+</div>
+
+ <h2>פ3Ľơʸ򴹽Ǥʥݥ򥲥åȤޤ礦!</h2>
+</div>
+</body>
+</html>
--- a/index.html	Wed Feb 12 17:27:13 2014 +0900
+++ b/index.html	Wed Feb 12 17:27:56 2014 +0900
@@ -1,8 +1,6 @@
 <html lang="ja">
 
 <head>
-<meta name="description" content="ĻԤξȯ">
-<meta name="keywords" content="skip,SKIP,,,,󤯤,SWAN">
 <title>SKIP - Shonai Koeki Information Project</title>
 <link rel="stylesheet" type="text/css" href="skip.css">
 </head>
@@ -11,37 +9,43 @@
 
 <div class="side_photo_right">
 <p><a href="syuzai/dezima.html">
-<img src="syuzai/dezima4-150.JPG" alt="dezima" width="" style="align: right;">
+<img src="picture/dezima4-150.JPG" alt="dezima" width="" style="align: right;">
 </a></p>
 <p><a href="syuzai/nisimura.html">
-<img src="syuzai/nisimura1-150.JPG" alt="nisimura" width="" style="align: right;">
+<img src="picture/nisimura1-150.JPG" alt="nisimura" width="" style="align: right;">
 </a></p>
 <p><a href="enq/ogawaen.html">
-<img src="syuzai/ogawaen1-150.jpg" alt="photo" width="" style="align: right;">
+<img src="picture/ogawaen1-150.jpg" alt="photo" width="" style="align: right;">
 </a></p>
 <p><a href="enq/pom.html">
-<img src="syuzai/pom3-150.jpg" alt="photo" width="" style="align: right;">
+<img src="picture/pom3-150.jpg" alt="photo" width="" style="align: right;">
 </a></p>
-<p><a href="syuzai/romantei.html">
-<img src="syuzai/romantei2-150.jpg" alt="photo" width="" style="align: right;">
+<p><a href="index.html">
+<img src="picture/romantei2-150.jpg" alt="photo" width="" style="align: right;">
 </a></p>
-<p><a href="syuzai/rupo.html">
-<img src="syuzai/rupo1-150.jpg" alt="photo" width="" style="align: right;">
+<p><a href="url">
+<img src="picture/rupo1-150.jpg" alt="photo" width="" style="align: right;">
 </a></p>
 <p><a href="syuzai/tukusi.html">
-<img src="syuzai/tukusi1-150.JPG" alt="photo" width="" style="align: right;">
+<img src="picture/tukusi1-150.JPG" alt="photo" width="" style="align: right;">
 </a></p>
 <p><a href="enq/als.html">
-<img src="syuzai/ars1-150.jpg" alt="photo" width="" style="align: right;">
+<img src="picture/ars1-150.jpg" alt="photo" width="" style="align: right;">
 </a></p>
 </div>
 
 <div class="fix">
 <div class="menu">
+<<<<<<< local
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr><td><a href=".">top</a></td><td><a href="syuzai.html"><img src="" alt=""></a></td><td><a href="program.html">ץ</a></td><td><a href="enq.html">󥱡</a></td></tr>
+=======
 <table>
  <tr><td><a href=".">top</a></td><td><a href="syuzai/syuzai.html">
  </a></td><td><a href="program/program.html">ץ</a></td><td><a
  href="enq/enq.html">󥱡</a></td><td><a href="kiraribito/girl.html">Ӥ</a></td></tr>
+>>>>>>> other
 </table>
 </div>
 </div>
@@ -50,26 +54,38 @@
 <img src="skip-kamo-small.png" alt="kamon">
 </div>
 
+<<<<<<< local
+<p class="new"><span></span>hogehogehogehoge </p>
+=======
 <p class="new"><span></span> <a href="syuzai/ikeda.html">ķŹࡪ<a></p>
 
 <h3>SKIPȤϡ</h3>
 <p>SKIPϡ̸ʸؤξȴΩ줿Ǥꡢ
 ľĽ꤬Ť<a href="https://ja-jp.facebook.com/SWAN.PROJECT">SWANProject</a>פȶϤƼϰξȯ뤳ȤŪȤƤ롣</p>
 
+>>>>>>> other
 <div class="staff">
 <h3>
 STAFF
 </h3>
-<p>  <a href="staff/ayae/index.html"><img src="staff/ayae-80.jpg" alt="䤨"></a>
-  <a href="staff/kei/index.html"><img src="staff/kei1-80.jpg" alt="kei"></a>
- <a href="staff/masaki/index.html"><img src="staff/murakami-80.jpg" alt="¼"></a>
-<a href="staff/rina/index.html"><img src="staff/rina-80.jpg" alt="rina&#9825;"></a>
-<a href="staff/oyamada/index.html"><img src="staff/oyamada-80.jpg" alt=""></a>
-<a href="staff/chokai/index.html"><img src="staff/chokai-80.jpg" alt="chokai"></a></p>
+<table style="border-collapse: collapse; margin-left:
+ auto; margin-right: auto;">
+ <tr>
+  <td><a href="staff/ayae/index.html"><img src="picture/ayae-100.jpg" alt="䤨"></a></td>
+  <td><a href="staff/kei/index.html"><img src="picture/" alt="kei"></a></td>
+ <td><a href="staff/masaki/index.html"><img src="picture/" alt="¼"></a></td>
+<td><a href="staff/rina/index.html"><img src="picture/" alt="rina&#9825;"></a></td>
+<td><a href="staff/oyamada/index.html"><img src="picture/" alt=""></a></td>
+<td><a href="staff/chokai/index.html"><img src="picture/" alt="chokai"></a></td>
+<td><a href="staff/yuuji/index.html"><img src="picture/" alt="yuuji"></a></td>
 
-
+</tr>
+</table>
 
 </div>
 
+<p>SKIPϡ̸ʸؤξȴ<br>
+ơߤʤۤۤʤΤǤhoge</p>
+
 </body>
 </html>
Binary file nakamachi.png has changed
--- a/skip.css	Wed Feb 12 17:27:13 2014 +0900
+++ b/skip.css	Wed Feb 12 17:27:56 2014 +0900
@@ -75,13 +75,17 @@
     text-align:left;
 }
 
-h1.topic {
-	width:100%;
+h3 {
 	text-align:center;
+<<<<<<< local
+=======
 	border-style-bottom:thin solid; 
 	color:blue;
+>>>>>>> other
 }
 
+<<<<<<< local
+=======
 
 h1.topic span {
 	background:#ffd620;
@@ -95,12 +99,11 @@
     border:thin soid 
 }
 
+>>>>>>> other
 div.staff {
 	taxt-align: center;
 }
 
-
-
 /*Lꗗ*/
 h2.article_list {
 	border-color:red;
@@ -171,20 +174,16 @@
     margin-right: 8px;
 }
 
-/*cVeB[n[t}\*/
+/*city marathon2013*/
 
-div.map{
-    margin-right:30px;
-    margin-left:30px;
-    margin-top:10px;
-    margin-bottom:10px;
-    text-align:center;
-    border:thin solid;
-   # fillter:alpha(opacity=50);
-   # -moz-opacity:0.5;
-   # opacity:0.5;
+div.map_nakamachi{
+    text-align:left;
 }
 
+<<<<<<< local
+div.map_nakamachi img{
+    margin:2% 15% 2% 2%; 
+=======
 div.mara p{text-align: left}
 
 div.monologue {
@@ -193,11 +192,14 @@
   border-top-left-radius: 0ex;
   margin-left: 130px;
   margin-top: 20px;
+>>>>>>> other
 }
+<<<<<<< local
+=======
 
 div.monologue p{text-align: left}
 
 div.img {
   background: url(kamonkun01_migi.png) no-repeat;
   text-align: left;
-}
\ No newline at end of file
+}>>>>>>> other
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skip.css.orig	Wed Feb 12 17:27:56 2014 +0900
@@ -0,0 +1,146 @@
+/*SKIPTOPy[W*/
+body {
+	
+}
+
+div.fix {
+	position:fixed;
+	width: 100%;
+	border: 2px black solid;
+	box-shadow: gray 3px 3px 3px
+}
+
+div.main_title{
+    text-align:center;
+}
+
+
+div.side_photo_right{
+	text-align:right;
+	margin-top:2em;
+	margin-right:20px;
+	margin-left:1em;
+	width: 152px;
+	float:right;
+}
+
+
+div.menu {
+	background:#ffd620;
+	color:blue;
+	width:11%
+	text-align:center;
+	border-bottom-style:thin solid;
+	padding:2px 2px 2px 2px;
+}
+
+div.menu div{
+    margin-left:3%;
+    float:left;
+    background:#ffd620;
+    width:16%;
+}
+
+div.menu table {
+    text-align:center;
+}
+
+div.menu table td {
+    width:8em;
+    text-align:center;
+}
+
+div.menu table td a:hover {
+	background:white;
+}
+
+div.menu table td a:active {
+	background:#ffb820;
+	color:#ff5a20;	
+}
+p.new {
+	width:100%;
+	text-align:center;
+	border-style-bottom:thin solid; 
+	color:blue;
+}
+
+p.new span {
+	background:#ffd620;
+	padding:2px 2px 2px 2px;
+}
+
+p {
+    text-align:center;
+}
+
+h3 {
+	text-align:center;
+}
+
+div.staff {
+	taxt-align: center;
+}
+
+/*Lꗗ*/
+h2.article_list {
+	border-color:red;
+	border-right-style:none;
+	border-left-style:none;
+	border-top-style:thick solid;
+	border-bottom:thick solid;
+}
+
+div.shop_left {
+	float: left;
+	width:40%
+	margin:0 2% 0 8%;
+}
+
+div.shop_right {
+	float: right;
+	width:40%;
+	margin:0 2% 0 8%;	
+}
+
+/**/
+
+img.shadow, *.shadow img {
+	border: white 3px solid; box-shadow: black 3px 3px 3px;
+	margin-right: 3px; margin-bottom: 3px;
+}
+
+div.side_photo_right img{
+    border: 2px yellow solid;
+    box-shadow: orange 3px 3px 3px;
+
+}
+
+/*Hו@*/
+
+div.syuzai_pic img{
+    border: 2px yellow solid;
+    box-shadow: orange 3px 3px 3px; 
+}
+
+h2{
+    
+}
+
+/*X^bt@uO*/
+
+div.staff img{
+    border: 1px blue solid;
+    box-shadow: green 2px 2px 2px;
+    margin-right: 8px;
+}
+
+/*city marathon2013*/
+
+div.map_nakamachi{
+    text-align:left;
+}
+
+div.map_nakamachi img{
+    margin:2% 15% 2% 2%; 
+}
--- a/staff/masaki/index.html	Wed Feb 12 17:27:13 2014 +0900
+++ b/staff/masaki/index.html	Wed Feb 12 17:27:56 2014 +0900
@@ -13,43 +13,23 @@
 </head>
 
 <body>
-
-<div class="back">
-<h1>Welcome to Murakami's page!!</h1>
-
-<div class="new">
-
-<div class="new_bar">
-aaaaa
+<div id="menu">
+<ul>
+<li class="gnav01"><a href="./">ۡ</a></li>
+<li class="gnav02"><a href="./">--  --</a></li>
+<li class="gnav03"><a href="./">--  --</a></li>
+<li class="gnav04"><a href="./">--  --</a></li>
+<li class="gnav05"><a href="./">--  --</a></li>
+</ul>
 </div>
-<iframe src="news.html">
-ΥڡǤϥ饤ե졼ѤƤޤ<br>
-줤ޤб֥饦Ǻ٤
-</iframe>
-<!--
-<div class="new_topics">
-iiiii<br>
-ccccc<br>
-kkkkk<br>
-ooooo<br>
-ttttt<br>
-</div>
--->
-</div>
-
-</div>
-
-<!--
-<div class="map">
-<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.co.jp/?ie=UTF8&amp;ll=38.916544,139.834816&amp;spn=0.000947,0.001963&amp;t=m&amp;z=18&amp;brcurrent=3,0x5f8e9e5d09cd818f:0x3f245bc064d35a33,1&amp;output=embed"></iframe><br /><small><a href="https://maps.google.co.jp/?ie=UTF8&amp;ll=38.916544,139.834816&amp;spn=0.000947,0.001963&amp;t=m&amp;z=18&amp;brcurrent=3,0x5f8e9e5d09cd818f:0x3f245bc064d35a33,1&amp;source=embed" style="color:#0000FF;text-align:left">礭ϿޤǸ</a></small>
-</div>
--->
 
 <p>
 ߽...<br>
 Under construction...
 </p>
 
+
+
 <address>c112124&#x40;h.koeki-u.ac.jp</address>
 
 </div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/staff/masaki/main.css	Wed Feb 12 17:27:56 2014 +0900
@@ -0,0 +1,11 @@
+   body {
+
+   	 
+
+   }
+
+   h1 {
+
+      
+
+   }

yatex.org