changeset 3690:ad797afbbd65

Merge branch 'master' of ssh://www.yatex.org:29418/yuuji/skip-web
author Inouedesu <c117033@e.koeki-u.ac.jp>
date Fri, 15 Jun 2018 14:47:30 +0900
parents d4d0c4992b69 (current diff) 50f7921ee19b (diff)
children f65304ec5ee4
files
diffstat 6 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
Binary file js/leaflet_1.1.0/images/layers-2x.png has changed
Binary file js/leaflet_1.1.0/images/layers.png has changed
Binary file js/leaflet_1.1.0/images/marker-icon-2x.png has changed
Binary file js/leaflet_1.1.0/images/marker-icon.png has changed
Binary file js/leaflet_1.1.0/images/marker-shadow.png has changed
--- a/shuzai/space5/nico/nico.html	Fri Jun 15 14:47:21 2018 +0900
+++ b/shuzai/space5/nico/nico.html	Fri Jun 15 14:47:30 2018 +0900
@@ -1,7 +1,7 @@
 <!DOGTYPE html>
 <html>
 <head>
-<title>nico</title>
+<title>Nico</title>
 
 <link rel="stylesheet" type="text/css" href="nico.css"> 
 <link rel="stylesheet" href="../../../js/colorbox_1.6.4/css_type/colorbox3.css" />
@@ -11,12 +11,12 @@
 <link rel="stylesheet" href="../../../js/leaflet_1.1.0/leaflet.css" />	<!-- (1) -->
 <script src="../../../js/leaflet_1.1.0/leaflet.js"></script>
 </head>
-<body>
+<body >
 <h1 id="nico">Nico</h1>
 
 <div id="mymap"></div>
 <script type="text/javascript" src="./nico.js" charset="utf-8"></script>
-<div style="display:none">
+<div style="display:none" charset="utf-8">
 <div id="menu1"><h2>月山高原の人参を使用したムース</h2>
 <img src="image_nico/imo.JPG" alt="1518x854(514975bytes)" title="小さな前菜"></div>
 <div id="menu2"><h2>庄内産のブロッコリーと生卵を使用したキッシュ</h2>

yatex.org