# HG changeset patch # User FUJIKAWA Kosuke # Date 1392193676 -32400 # Node ID 05a4ec7de2f9bf745541d79f933e4d25aa2fbce4 # Parent 7f9ea0116d9b82269e40d1e54d1737e57132e9ab# Parent 3ed52802fafbb3a434705c08869435099143f430 commited diff -r 7f9ea0116d9b -r 05a4ec7de2f9 #index.html# --- 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 @@ - - - -SKIP - Shonai Koeki Information Project - - - - - -
-

-dezima -

-

-nisimura -

-

-photo -

-

-photo -

-

-photo -

-

-photo -

-

-photo -

-

-photo -

-

-
- -
-
- - -
top取材プログラムアンケート
-
-
- -
-title logokamon -
- -

新着情報

-
-

-☆STAFF☆ -

- - - - - - -
あやえkei村上rina♡小山田chokai
- - diff -r 7f9ea0116d9b -r 05a4ec7de2f9 #marathon2013.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 @@ + + +酒田シティハーフマラソン + + + + + +
+
+ + +
top取材プログラムアンケートきらりびと
+
+
+ +
+kamon +
+ +
+

酒田シティハーフマラソン

+ +
+中町詳細マップ +
+ +

SWAN　 +Project

+ +

スタンプラリーでお得なクーポンをスマホでゲット!

+ +

スタンプラリー参加の事前準備

+
    +
  1. スマホの「Google play」もしくは「App Store」を開き、「フレッツ」で無料ア +プリを検索します。
    2. +
  2. 「FLET'S WiFiアプリ」を無料ダウンロードをします。
    3. +
    +
  3. アプリを起動して、ユーザー登録をします。
    4. +
+

酒田シティーハーフマラソンandどんしゃん祭り当日

+

スタンプラリー店舗に行って、スマホでスタンプを押していきます。

+
+
+
+
+

それだけです!!

+ +

スタンプを5個集めて、賞品交換所でお得なクーポンをゲットしましょう!

+
+ + diff -r 7f9ea0116d9b -r 05a4ec7de2f9 event/marathon2013.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 @@ + alt="">
topץ - 󥱡Ӥ
ץ󥱡Ӥ
@@ -25,6 +23,10 @@

ĥƥϡեޥ饽

+ +
+Įܺ٥ޥå +

SWAN Project

diff -r 7f9ea0116d9b -r 05a4ec7de2f9 event/marathon2013.html.orig --- /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 @@ + + +ĥƥϡեޥ饽 + + + + + + +
+
+ + +
topץ󥱡Ӥ
+
+
+ +
+kamon +
+ +
+

ĥƥϡեޥ饽

+ +
+Įܺ٥ޥå +
+

SWAN +Project

+ +

ˤʤ뤪Źο᤭Ф򥯥å

+
+ + + ե顼ȡ⥢ + ʩŤκƣ + ۾ + Ʋٻ + ˥ĮŹ + եåե롼İƣ + Ρ䤵ˤ + 業ѥ + 򡦿ͷեȤ + Įޥ륷 + 굮² + ե󥷡å¿ + ̼ + +
+ +

ץ꡼Ǥʥݥ򥹥ޥۤǥå!

+ +

ץ꡼äλ

+
    +
  1. ޥۤΡGoogle playפ⤷ϡApp Storeפ򳫤֥եåġפ̵ +ץ򸡺ޤ
    2. +
  2. FLET'S WiFiץפ̵ɤ򤷤ޤ
    3. +
    +
  3. ץươ桼Ͽ򤷤ޤ
    4. +
+

ĥƥϡեޥ饽andɤ󤷤פ

+

ץ꡼Źޤ˹Ԥäơޥۤǥפ򲡤Ƥޤ

+
+
+
+
+ +

פ3Ľơʸ򴹽Ǥʥݥ򥲥åȤޤ礦!

+
+ + diff -r 7f9ea0116d9b -r 05a4ec7de2f9 index.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 @@ - - SKIP - Shonai Koeki Information Project @@ -11,37 +9,43 @@

-dezima +dezima

-nisimura +nisimura

-photo +photo

-photo +photo

-

-photo +

+photo

-

-photo +

+photo

-photo +photo

-photo +photo

+<<<<<<< local + + +=======
topץ󥱡
+>>>>>>> other
top ץ󥱡Ӥ
@@ -50,26 +54,38 @@ kamon
+<<<<<<< local +

hogehogehogehoge

+=======

ķŹࡪ

SKIPȤϡ

SKIPϡ̸ʸؤξȴΩ줿Ǥꡢ ľĽ꤬ŤSWANProjectפȶϤƼϰξȯ뤳ȤŪȤƤ롣

+>>>>>>> other

STAFF

-

䤨 - kei - ¼ -rina♡ - -chokai

+ + + + + + + + + - + +
䤨kei¼rina♡chokaiyuuji
+

SKIPϡ̸ʸؤξȴ
+ơߤʤۤۤʤΤǤhoge

+ diff -r 7f9ea0116d9b -r 05a4ec7de2f9 nakamachi.png Binary file nakamachi.png has changed diff -r 7f9ea0116d9b -r 05a4ec7de2f9 skip.css --- 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 diff -r 7f9ea0116d9b -r 05a4ec7de2f9 skip.css.orig --- /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%; +} diff -r 7f9ea0116d9b -r 05a4ec7de2f9 staff/masaki/index.html --- 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 @@ - -
-

Welcome to Murakami's page!!

- -
- -
-aaaaa + - - -
- -
- -

߽...
Under construction...

+ +
c112124@h.koeki-u.ac.jp
diff -r 7f9ea0116d9b -r 05a4ec7de2f9 staff/masaki/main.css --- /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 { + + + + }