From 8a02b36f340d0a57611347e05638fd11ab711df8 Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Thu, 12 Apr 2018 15:09:30 +0900 Subject: [PATCH 01/12] empty commit From f032c9ba6b25fecb68d6bfbc620a05baf2736df0 Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 13 Apr 2018 14:53:38 +0900 Subject: [PATCH 02/12] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=B5=90=E6=9E=9C?= =?UTF-8?q?=E3=81=AE=E5=80=99=E8=A3=9C=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/map-design.css | 40 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/assets/css/map-design.css b/assets/css/map-design.css index 42725c6..2160141 100644 --- a/assets/css/map-design.css +++ b/assets/css/map-design.css @@ -1,3 +1,8 @@ +ul { + margin: 0; + padding: 0; +} + /* ボタン、メニューなどのデザイン aidmiya */ /* なお、map.cssにも手を加えることがあります */ @@ -139,7 +144,7 @@ form.search { } form .search-box { - margin: 0.5em; + margin: .5em .5em 0 .5em; position: relative; /* [x]のrightの基準 */ display: flex; @@ -149,8 +154,8 @@ form .search-box { /* とりあえず見やすくするために */ border-bottom: 1px solid rgba(72, 72, 72, 0.7); background-color: #fafafa; - box-shadow: 0px 0px 4px 1px rgba(184, 184, 184, 0.8); - border-radius: 5px; + /*box-shadow: 0px 0px 4px 1px rgba(184, 184, 184, 0.8);*/ + border-radius: 5px 5px 0 0; } form input[type="text"] { @@ -189,3 +194,32 @@ form.search.menuactive { /* width: calc( 100% - 270px ); Safariで確認してみると、幅が短かった */ width: calc( 100vw - 48% - 1.5em); } + +.result { + margin: 0 0.5em; + position: relative; + align-items: center; + height: 100%; + border-bottom: 1px solid rgba(72, 72, 72, 0.7); + background-color: #fafafa; + /*box-shadow: 0px 0px 4px 1px rgba(184, 184, 184, 0.8);*/ + border-radius: 0 0 5px 5px; +} + +.result ul { + padding-top: 1em; + list-style: none; + display: block; +} + +.result ul li { + padding-left: 1em; + display: inline-block; + width: calc(100% - 1em); + /*border: .1px solid;*/ + line-height: 1.6em; +} + +.result li:hover { + background-color: rgba(230,230,230,.8); +} From 851aa71af4aab9370f363d1e66c976f40f3cb88d Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Thu, 21 Jun 2018 15:33:27 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/map-design.css | 68 ++-- assets/libs/ol3-search/searchcontrol.css | 30 +- assets/libs/ol3-search/searchcontrol.js | 300 ++++++++++-------- .../libs/ol3-search/searchfeaturecontrol.js | 110 ++++--- map.html | 257 +++++++-------- 5 files changed, 406 insertions(+), 359 deletions(-) diff --git a/assets/css/map-design.css b/assets/css/map-design.css index 2160141..93a8e60 100644 --- a/assets/css/map-design.css +++ b/assets/css/map-design.css @@ -28,16 +28,16 @@ ul { /* .ol-full-screenと.ol-zoomはol.cssのを上書きされている。!importantを使わず、読み込み順で上書きしている */ .ol-full-screen { right: 0.5em; - top: calc( 0.5em + 3em); + top: calc(0.5em + 3em); } .ol-zoom { left: 0.5em; - top: calc( 3em + 0.5em); + top: calc(3em + 0.5em); } .ol-zoomslider { - top: calc( 1.375em + 3em + 0.5em); + top: calc(1.375em + 3em + 0.5em); } /* メニューを閉じるボタン */ @@ -57,7 +57,7 @@ ul { height: 100%; top: 0; right: 0; - background-color: rgba(245, 245, 245, .8); + background-color: rgba(245, 245, 245, 0.8); /* 100vhを超えればスクロールできるのでそれがわかるようにする */ overflow: auto; } @@ -83,11 +83,11 @@ ul { .menu li { list-style-type: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, .1); + -webkit-tap-highlight-color: rgba(0, 0, 0, 0.1); } .menu li:hover { - background-color: rgba(0, 0, 0, .1); + background-color: rgba(0, 0, 0, 0.1); } .menu .menu-nohover { @@ -104,12 +104,13 @@ ul { .menu .menu-buildings { /* 高さはどう指定? */ - height: calc( 100vh - 20em); + height: calc(100vh - 20em); overflow: auto; -webkit-overflow-scrolling: touch; } -.menu .menu-content, .menu .menu-content a { +.menu .menu-content, +.menu .menu-content a { color: #c81e00; } @@ -122,7 +123,6 @@ ul { text-align: right; } - /* ポップアップの表 */ .ol-popup table { border: 0; @@ -135,18 +135,14 @@ ul { } /* 検索ボックスのフォーム */ -form.search { - width: calc( 100vw - 4em); +.search { + width: calc(100vw - 4em); max-width: 500px; - position: relative; + /* [x]のrightの基準 */ + margin: 0.5em 0.5em 0 0.5em; + position: absolute; top: 0; left: 0; -} - -form .search-box { - margin: .5em .5em 0 .5em; - position: relative; - /* [x]のrightの基準 */ display: flex; align-items: center; /* [x]を縦で中央に */ @@ -158,23 +154,24 @@ form .search-box { border-radius: 5px 5px 0 0; } -form input[type="text"] { - width: calc( 100vw - 3em); +input[type="search"] { + width: calc(100vw - 3em); border: 0; border-radius: 5px; - height: calc( 2.5em - 2px - 8px); + height: calc(2.5em - 10px); background-color: #fafafa; - margin: 0 3.5em 0 1em; + padding: 0 3.5em 0 1em; /* height: calc( 2.5em - 2px ); Safariで入力欄が縦に長いのでもう少し低くする */ /* font-size: 1.5em; Safariで入力欄が縦に長くなるのでfont-sizeは使わない */ } -input[type="text"]:focus { +input[type="search"]:focus { outline: 0; } -form input[type="reset"] { +input[type="reset"] { position: absolute; + top: 0; right: 0; width: 2.5em; height: 2.5em; @@ -182,32 +179,35 @@ form input[type="reset"] { border-radius: 5px; background-color: #eee; padding: 0; + z-index: 10; /* ボタンクリック時に文字が右下へ下がるのを防ぐため */ } -form input[type="reset"]:hover { +input[type="reset"]:hover { background-color: #ccc; } /* 検索ボックス・メニューが開いている時 */ -form.search.menuactive { +.search.menuactive { /* width: calc( 100% - 270px ); Safariで確認してみると、幅が短かった */ - width: calc( 100vw - 48% - 1.5em); + width: calc(100vw - 48% - 1.5em); } .result { + visibility: hidden; margin: 0 0.5em; - position: relative; + position: absolute; + top: 41px; + left: -8px; align-items: center; - height: 100%; + width: 100%; border-bottom: 1px solid rgba(72, 72, 72, 0.7); background-color: #fafafa; - /*box-shadow: 0px 0px 4px 1px rgba(184, 184, 184, 0.8);*/ + box-shadow: 0px 0px 4px 1px rgba(184, 184, 184, 0.8); border-radius: 0 0 5px 5px; } .result ul { - padding-top: 1em; list-style: none; display: block; } @@ -216,10 +216,10 @@ form.search.menuactive { padding-left: 1em; display: inline-block; width: calc(100% - 1em); - /*border: .1px solid;*/ line-height: 1.6em; } -.result li:hover { - background-color: rgba(230,230,230,.8); +.result li:hover, +.select { + background-color: rgba(230, 230, 230, 0.8); } diff --git a/assets/libs/ol3-search/searchcontrol.css b/assets/libs/ol3-search/searchcontrol.css index 282d473..fb51e4a 100644 --- a/assets/libs/ol3-search/searchcontrol.css +++ b/assets/libs/ol3-search/searchcontrol.css @@ -17,7 +17,7 @@ float: left; } -.ol-search input { +/* .ol-search input { display: inline-block; border: 0; margin: 1px 1px 1px 2px; @@ -26,13 +26,15 @@ height: 1.375em; box-sizing: border-box; transition: all 0.1s; -} +} */ -.ol-touch .ol-search input, .ol-touch .ol-search ul { +.ol-touch .ol-search input, +.ol-touch .ol-search ul { font-size: 1.5em; } -.ol-control.ol-search.ol-collapsed ul, .ol-control.ol-search.ol-collapsed input { +.ol-control.ol-search.ol-collapsed ul, +.ol-control.ol-search.ol-collapsed input { display: none; } @@ -47,14 +49,11 @@ overflow-x: hidden; } - -/* -.ol-control.ol-search ul -{ position: absolute; - background: #fff; - box-shadow: 5px 5px 5px rgba(0,0,0,0.5); -} -*/ +/* .ol-control.ol-search ul { + position: absolute; + background: #fff; + box-shadow: 5px 5px 5px rgba(0,0,0,0.5); +} */ .ol-control.ol-search ul li { padding: 0.1em 0.5em; @@ -66,7 +65,8 @@ text-overflow: ellipsis; } -.ol-search ul li.select, .ol-search ul li:hover { - background-color: rgba(0, 60, 136, .5); +.ol-search ul li.select, +.ol-search ul li:hover { + background-color: rgba(0, 60, 136, 0.5); color: #fff; -} \ No newline at end of file +} diff --git a/assets/libs/ol3-search/searchcontrol.js b/assets/libs/ol3-search/searchcontrol.js index d72f1b1..ccc6aab 100644 --- a/assets/libs/ol3-search/searchcontrol.js +++ b/assets/libs/ol3-search/searchcontrol.js @@ -1,162 +1,202 @@ -/* Copyright (c) 2017 Jean-Marc VIGLINO, - released under the CeCILL-B license (French BSD license) - (http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt). -*/ -/** - * Search Control. This is the base class for search controls. You can use it for simple custom search or as base to new class - * - * @constructor - * @extends {ol.control.Control} - * @fires select, change:input - * @param {Object=} Control options. - * @param {string} options.className control class name - * @param {Element | string | undefined} options.target Specify a target if you want the control to be rendered outside of the map's viewport. - * @param {string | undefined} options.placeholder placeholder, default "Search..." - * @param {number | undefined} options.typing a delay on each typing to start searching (ms) use -1 to prevent autocompletion, default 300. - * @param {integer | undefined} options.minLength minimum length to start searching, default 1 - * @param {integer | undefined} options.maxItems maximum number of items to display in the autocomplete list, default 10 - * @param {function} options.getTitle a function that takes a feature and return the name to display in the index. - * @param {function} options.autocomplete a function that take a search string and callback function to send an array - */ -ol.control.Search = function (options) { +// Copyright (c) 2017 Jean-Marc VIGLINO, +// released under the CeCILL-B license (French BSD license) +// (http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt). + +// Search Control. This is the base class for search controls. You can use it for simple custom search or as base to new class +// @constructor +// @extends {ol.control.Control} +// @fires select, change:input +// @param {Object=} Control options. +// @param {string} options.className control class name +// @param {Element | string | undefined} options.target Specify a target if you want the control to be rendered outside of the map's viewport. +// @param {string | undefined} options.placeholder placeholder, default "Search..." +// @param {number | undefined} options.typing a delay on each typing to start searching (ms) use -1 to prevent autocompletion, default 300. +// @param {integer | undefined} options.minLength minimum length to start searching, default 1 +// @param {integer | undefined} options.maxItems maximum number of items to display in the autocomplete list, default 10 +// @param {function} options.getTitle a function that takes a feature and return the name to display in the index. +// @param {function} options.autocomplete a function that take a search string and callback function to send an array + +ol.control.Search = function(options) { var self = this; if (!options) options = {}; if (options.typing == undefined) options.typing = 300; var element; - if (options.target) { - element = $("
").addClass((options.className || "") + " ol-search"); - } else { - element = $("
").addClass((options.className || "") + ' ol-search ol-unselectable ol-control ol-collapsed'); - this.button = $(" -
+
- - - + + +
+ (C) 2017-
Kuremap Team +
+ + + -
- - -
-
- -
-

+ +

+ + +
+
+ +
+

position accuracy :    altitude :    altitude accuracy :    @@ -106,57 +116,56 @@ speed :

-
- - -
+
+ + +
-
-

Options:

-
    -
  • - maxInputs: -
    • -
  • - search property: - +
    • +
  • + search property: + - -
    • -
-
+ + + - + - + - - + + - - + + - + - - + + - - + + - - - + + - + - - - + + + + From 50a5e3c0c0aa0358a49a68498113747f36995847 Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Thu, 21 Jun 2018 15:34:12 +0900 Subject: [PATCH 04/12] fix paths --- assets/layers/overlay.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/layers/overlay.js b/assets/layers/overlay.js index 6a32f3c..b780d9c 100644 --- a/assets/layers/overlay.js +++ b/assets/layers/overlay.js @@ -53,8 +53,8 @@ var tile = new ol.layer.Tile({ // }) // }); - var vectorSource = new ol.source.Vector( - { url: path + 'assets/geojson/searchtest.geojson', + var vectorSource = new ol.source.Vector({ + url: 'assets/geojson/searchtest.geojson', projection: 'EPSG:3857', format: new ol.format.GeoJSON() - }); \ No newline at end of file + }); From b8d0f4df24fd34ca6d33c3440e91ccb8727a925e Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Thu, 21 Jun 2018 15:34:22 +0900 Subject: [PATCH 05/12] prettier --- assets/css/map.css | 4 ++-- assets/geojson/searchtest.geojson | 2 +- assets/js/main.js | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/css/map.css b/assets/css/map.css index 0c0b45c..8975029 100644 --- a/assets/css/map.css +++ b/assets/css/map.css @@ -1,6 +1,6 @@ html, body, #map { margin: 0; - height: 100%; + height: 80%; width: 100%; } @@ -74,4 +74,4 @@ html, body, #map { .block { display: block; -} \ No newline at end of file +} diff --git a/assets/geojson/searchtest.geojson b/assets/geojson/searchtest.geojson index 280cc21..42ec783 100644 --- a/assets/geojson/searchtest.geojson +++ b/assets/geojson/searchtest.geojson @@ -45,4 +45,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/js/main.js b/assets/js/main.js index 3da5f91..8635f02 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -4,7 +4,7 @@ var map = new ol.Map({ new ol.interaction.DragRotateAndZoom() ]), controls: ol.control.defaults().extend([ - new ol.control.FullScreen({source: 'fullscreen'}),new ol.control.ZoomSlider() + new ol.control.FullScreen({ source: 'fullscreen' }), new ol.control.ZoomSlider() ]), layers: [ new ol.layer.Group({ @@ -18,7 +18,7 @@ var map = new ol.Map({ new ol.layer.Group({ title: 'Overlays', layers: [aed, kml, geocycle, tile, - // vectorSource + // vectorSource ] }) ], @@ -30,7 +30,7 @@ var select = new ol.interaction.Select({}); map.addInteraction(select); // On selected => show/hide popup -select.getFeatures().on(['add'], function(e) { +select.getFeatures().on(['add'], function (e) { var feature = e.element; var content = ""; content += "" @@ -43,7 +43,7 @@ select.getFeatures().on(['add'], function(e) { content += "
" popup.show(feature.getGeometry().getCoordinates(), content); }) -select.getFeatures().on(['remove'], function(e) { +select.getFeatures().on(['remove'], function (e) { popup.hide(); }) @@ -87,6 +87,6 @@ search.on('select', function (e) { ol.hash(map); // 北ボタン -$('#north_button').on('click', function() { +$('#north_button').on('click', function () { map.getView().setRotation(0); }); From d42e3443c5d7875c7d7bf5cca59385d1082ddb8c Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 20:59:11 +0900 Subject: [PATCH 06/12] =?UTF-8?q?src=E3=81=B8=E7=A7=BB=E5=8B=95=E3=81=95?= =?UTF-8?q?=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/font-awesome/HELP-US-OUT.txt | 7 - assets/css/font-awesome/scss/_animated.scss | 34 - .../font-awesome/scss/_bordered-pulled.scss | 25 - assets/css/font-awesome/scss/_core.scss | 12 - .../css/font-awesome/scss/_fixed-width.scss | 6 - assets/css/font-awesome/scss/_icons.scss | 789 ----------------- assets/css/font-awesome/scss/_larger.scss | 13 - assets/css/font-awesome/scss/_list.scss | 19 - assets/css/font-awesome/scss/_mixins.scss | 60 -- assets/css/font-awesome/scss/_path.scss | 15 - .../font-awesome/scss/_rotated-flipped.scss | 20 - .../css/font-awesome/scss/_screen-reader.scss | 5 - assets/css/font-awesome/scss/_stacked.scss | 20 - assets/css/font-awesome/scss/_variables.scss | 800 ------------------ about.html => src/about.html | 0 about_us.html => src/about_us.html | 0 {assets => src/assets}/css/about_us.css | 0 {assets => src/assets}/css/common.css | 0 .../css/font-awesome/css/font-awesome.css | 0 .../css/font-awesome/css/font-awesome.min.css | 0 .../css/font-awesome/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../css/font-awesome/less/animated.less | 0 .../font-awesome/less/bordered-pulled.less | 0 .../assets}/css/font-awesome/less/core.less | 0 .../css/font-awesome/less/fixed-width.less | 0 .../css/font-awesome/less/font-awesome.less | 0 .../assets}/css/font-awesome/less/icons.less | 0 .../assets}/css/font-awesome/less/larger.less | 0 .../assets}/css/font-awesome/less/list.less | 0 .../assets}/css/font-awesome/less/mixins.less | 0 .../assets}/css/font-awesome/less/path.less | 0 .../font-awesome/less/rotated-flipped.less | 0 .../css/font-awesome/less/screen-reader.less | 0 .../css/font-awesome/less/stacked.less | 0 .../css/font-awesome/less/variables.less | 0 .../css/font-awesome/scss/font-awesome.scss | 0 {assets => src/assets}/css/index.css | 0 {assets => src/assets}/css/map-design.css | 0 {assets => src/assets}/css/map.css | 0 {assets => src/assets}/css/normalize.css | 0 .../assets}/geojson/20171218.geojson | 0 .../assets}/geojson/20171224.geojson | 0 {assets => src/assets}/geojson/common.geojson | 0 .../assets}/geojson/fond_guerre.geojson | 0 .../assets}/geojson/searchtest.geojson | 0 {assets => src/assets}/icon/aed.png | Bin {assets => src/assets}/icon/camera.png | Bin {assets => src/assets}/img/bg.png | Bin {assets => src/assets}/img/chanyou/avator.jpg | Bin {assets => src/assets}/img/chanyou/bg.jpg | Bin {assets => src/assets}/img/kaneko/avator.jpg | Bin {assets => src/assets}/img/kaneko/bg.jpg | Bin {assets => src/assets}/img/koba/avator.png | Bin {assets => src/assets}/img/koba/bg.jpg | Bin .../assets}/img/miyamoto/avator.jpg | Bin {assets => src/assets}/img/miyamoto/bg.jpg | Bin {assets => src/assets}/img/mori/avator.jpg | Bin {assets => src/assets}/img/mori/bg.jpg | Bin {assets => src/assets}/img/mori/moribg.jpg | Bin {assets => src/assets}/img/nitta/avator.jpg | Bin {assets => src/assets}/img/nitta/bg.jpg | Bin {assets => src/assets}/img/ochiai/avator.jpg | Bin {assets => src/assets}/img/ochiai/bg.jpg | Bin {assets => src/assets}/img/ohtsuka/avator.png | Bin {assets => src/assets}/img/ohtsuka/bg.jpg | Bin .../assets}/img/original/chanyou/avator.jpg | Bin .../assets}/img/original/chanyou/bg.jpg | Bin .../assets}/img/original/kaneko/avator.jpg | Bin .../assets}/img/original/kaneko/bg.jpg | Bin .../assets}/img/original/koba/avator.png | Bin .../assets}/img/original/koba/bg.jpg | Bin .../assets}/img/original/miyamoto/avator.jpg | Bin .../assets}/img/original/miyamoto/bg.jpg | Bin .../assets}/img/original/mori/avator.jpg | Bin .../assets}/img/original/mori/bg.jpg | Bin .../assets}/img/original/mori/moribg.jpg | Bin .../assets}/img/original/nitta/avator.jpg | Bin .../assets}/img/original/nitta/bg.jpg | Bin .../assets}/img/original/ochiai/avator.png | Bin .../assets}/img/original/ochiai/bg.png | Bin .../assets}/img/original/ohtsuka/avator.png | Bin .../assets}/img/original/ohtsuka/bg.png | Bin .../assets}/img/original/sin/avator.jpg | Bin .../assets}/img/original/sin/bg.jpg | Bin .../assets}/img/original/sin/bg.png | Bin .../assets}/img/original/tommy/avator.jpg | Bin .../assets}/img/original/tommy/bg.jpg | Bin {assets => src/assets}/img/pta01.png | Bin {assets => src/assets}/img/sin/avator.jpg | Bin {assets => src/assets}/img/sin/bg.jpg | Bin {assets => src/assets}/img/tommy/avator.jpg | Bin {assets => src/assets}/img/tommy/bg.jpg | Bin {assets => src/assets}/img/top01_img.jpg | Bin {assets => src/assets}/js/buttoncontrol.js | 0 {assets => src/assets}/js/geolocaton.js | 0 {assets => src/assets}/js/gps.js | 0 {assets => src/assets}/js/main.js | 0 {assets => src/assets}/js/map-design.js | 0 {assets => src/assets}/js/popup.js | 0 {assets => src/assets}/js/view.js | 0 {assets => src/assets}/layers/base.js | 0 {assets => src/assets}/layers/overlay.js | 0 {assets => src/assets}/libs/bootstrap.min.js | 0 {assets => src/assets}/libs/jquery.min.js | 0 {assets => src/assets}/libs/ol-hash.js | 0 {assets => src/assets}/libs/ol/ol.css | 0 {assets => src/assets}/libs/ol/ol.js | 0 {assets => src/assets}/libs/ol3-ext.css | 0 .../ol3-ext_popupoverlay/popupoverlay.css | 0 .../libs/ol3-ext_popupoverlay/popupoverlay.js | 0 .../ol3-layerswitcher/ol3-layerswitcher.css | 0 .../ol3-layerswitcher/ol3-layerswitcher.js | 0 .../assets}/libs/ol3-search/searchcontrol.css | 0 .../assets}/libs/ol3-search/searchcontrol.js | 0 .../libs/ol3-search/searchfeaturecontrol.js | 0 .../assets}/tiles2/17/113809/52253.png | Bin .../assets}/tiles2/17/113809/52254.png | Bin .../assets}/tiles2/17/113809/52255.png | Bin .../assets}/tiles2/17/113809/52256.png | Bin .../assets}/tiles2/17/113809/52257.png | Bin .../assets}/tiles2/17/113809/52258.png | Bin .../assets}/tiles2/17/113809/52259.png | Bin .../assets}/tiles2/17/113809/52260.png | Bin .../assets}/tiles2/17/113810/52253.png | Bin .../assets}/tiles2/17/113810/52254.png | Bin .../assets}/tiles2/17/113810/52255.png | Bin .../assets}/tiles2/17/113810/52256.png | Bin .../assets}/tiles2/17/113810/52257.png | Bin .../assets}/tiles2/17/113810/52258.png | Bin .../assets}/tiles2/17/113810/52259.png | Bin .../assets}/tiles2/17/113810/52260.png | Bin .../assets}/tiles2/17/113811/52255.png | Bin .../assets}/tiles2/17/113811/52256.png | Bin .../assets}/tiles2/17/113811/52257.png | Bin .../assets}/tiles2/17/113811/52258.png | Bin .../assets}/tiles2/17/113812/52255.png | Bin .../assets}/tiles2/17/113812/52256.png | Bin .../assets}/tiles2/17/113812/52257.png | Bin .../assets}/tiles2/17/113812/52258.png | Bin .../assets}/tiles2/17/113813/52255.png | Bin .../assets}/tiles2/17/113813/52256.png | Bin .../assets}/tiles2/17/113813/52257.png | Bin .../assets}/tiles2/17/113813/52258.png | Bin .../assets}/tiles2/17/113814/52255.png | Bin .../assets}/tiles2/17/113814/52256.png | Bin .../assets}/tiles2/17/113814/52257.png | Bin .../assets}/tiles2/17/113814/52258.png | Bin .../assets}/tiles2/17/113815/52255.png | Bin .../assets}/tiles2/17/113815/52256.png | Bin .../assets}/tiles2/17/113815/52257.png | Bin .../assets}/tiles2/17/113815/52258.png | Bin .../assets}/tiles2/17/113816/52255.png | Bin .../assets}/tiles2/17/113816/52256.png | Bin .../assets}/tiles2/17/113816/52257.png | Bin .../assets}/tiles2/17/113816/52258.png | Bin .../assets}/tiles2/17/113817/52255.png | Bin .../assets}/tiles2/17/113817/52256.png | Bin .../assets}/tiles2/17/113817/52257.png | Bin .../assets}/tiles2/17/113817/52258.png | Bin .../assets}/tiles2/17/113818/52253.png | Bin .../assets}/tiles2/17/113818/52254.png | Bin .../assets}/tiles2/17/113818/52255.png | Bin .../assets}/tiles2/17/113818/52256.png | Bin .../assets}/tiles2/17/113818/52257.png | Bin .../assets}/tiles2/17/113818/52258.png | Bin .../assets}/tiles2/17/113818/52259.png | Bin .../assets}/tiles2/17/113818/52260.png | Bin .../assets}/tiles2/17/113819/52253.png | Bin .../assets}/tiles2/17/113819/52254.png | Bin .../assets}/tiles2/17/113819/52255.png | Bin .../assets}/tiles2/17/113819/52256.png | Bin .../assets}/tiles2/17/113819/52257.png | Bin .../assets}/tiles2/17/113819/52259.png | Bin .../assets}/tiles2/17/113819/52260.png | Bin history.html => src/history.html | 0 index.html => src/index.html | 0 manual.html => src/manual.html | 0 map.html => src/map.html | 0 183 files changed, 1825 deletions(-) delete mode 100644 assets/css/font-awesome/HELP-US-OUT.txt delete mode 100644 assets/css/font-awesome/scss/_animated.scss delete mode 100644 assets/css/font-awesome/scss/_bordered-pulled.scss delete mode 100644 assets/css/font-awesome/scss/_core.scss delete mode 100644 assets/css/font-awesome/scss/_fixed-width.scss delete mode 100644 assets/css/font-awesome/scss/_icons.scss delete mode 100644 assets/css/font-awesome/scss/_larger.scss delete mode 100644 assets/css/font-awesome/scss/_list.scss delete mode 100644 assets/css/font-awesome/scss/_mixins.scss delete mode 100644 assets/css/font-awesome/scss/_path.scss delete mode 100644 assets/css/font-awesome/scss/_rotated-flipped.scss delete mode 100644 assets/css/font-awesome/scss/_screen-reader.scss delete mode 100644 assets/css/font-awesome/scss/_stacked.scss delete mode 100644 assets/css/font-awesome/scss/_variables.scss rename about.html => src/about.html (100%) rename about_us.html => src/about_us.html (100%) rename {assets => src/assets}/css/about_us.css (100%) rename {assets => src/assets}/css/common.css (100%) rename {assets => src/assets}/css/font-awesome/css/font-awesome.css (100%) rename {assets => src/assets}/css/font-awesome/css/font-awesome.min.css (100%) rename {assets => src/assets}/css/font-awesome/fonts/FontAwesome.otf (100%) rename {assets => src/assets}/css/font-awesome/fonts/fontawesome-webfont.eot (100%) rename {assets => src/assets}/css/font-awesome/fonts/fontawesome-webfont.svg (100%) rename {assets => src/assets}/css/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename {assets => src/assets}/css/font-awesome/fonts/fontawesome-webfont.woff (100%) rename {assets => src/assets}/css/font-awesome/fonts/fontawesome-webfont.woff2 (100%) rename {assets => src/assets}/css/font-awesome/less/animated.less (100%) rename {assets => src/assets}/css/font-awesome/less/bordered-pulled.less (100%) rename {assets => src/assets}/css/font-awesome/less/core.less (100%) rename {assets => src/assets}/css/font-awesome/less/fixed-width.less (100%) rename {assets => src/assets}/css/font-awesome/less/font-awesome.less (100%) rename {assets => src/assets}/css/font-awesome/less/icons.less (100%) rename {assets => src/assets}/css/font-awesome/less/larger.less (100%) rename {assets => src/assets}/css/font-awesome/less/list.less (100%) rename {assets => src/assets}/css/font-awesome/less/mixins.less (100%) rename {assets => src/assets}/css/font-awesome/less/path.less (100%) rename {assets => src/assets}/css/font-awesome/less/rotated-flipped.less (100%) rename {assets => src/assets}/css/font-awesome/less/screen-reader.less (100%) rename {assets => src/assets}/css/font-awesome/less/stacked.less (100%) rename {assets => src/assets}/css/font-awesome/less/variables.less (100%) rename {assets => src/assets}/css/font-awesome/scss/font-awesome.scss (100%) rename {assets => src/assets}/css/index.css (100%) rename {assets => src/assets}/css/map-design.css (100%) rename {assets => src/assets}/css/map.css (100%) rename {assets => src/assets}/css/normalize.css (100%) rename {assets => src/assets}/geojson/20171218.geojson (100%) rename {assets => src/assets}/geojson/20171224.geojson (100%) rename {assets => src/assets}/geojson/common.geojson (100%) rename {assets => src/assets}/geojson/fond_guerre.geojson (100%) rename {assets => src/assets}/geojson/searchtest.geojson (100%) rename {assets => src/assets}/icon/aed.png (100%) rename {assets => src/assets}/icon/camera.png (100%) rename {assets => src/assets}/img/bg.png (100%) rename {assets => src/assets}/img/chanyou/avator.jpg (100%) rename {assets => src/assets}/img/chanyou/bg.jpg (100%) rename {assets => src/assets}/img/kaneko/avator.jpg (100%) rename {assets => src/assets}/img/kaneko/bg.jpg (100%) rename {assets => src/assets}/img/koba/avator.png (100%) rename {assets => src/assets}/img/koba/bg.jpg (100%) rename {assets => src/assets}/img/miyamoto/avator.jpg (100%) rename {assets => src/assets}/img/miyamoto/bg.jpg (100%) rename {assets => src/assets}/img/mori/avator.jpg (100%) rename {assets => src/assets}/img/mori/bg.jpg (100%) rename {assets => src/assets}/img/mori/moribg.jpg (100%) rename {assets => src/assets}/img/nitta/avator.jpg (100%) rename {assets => src/assets}/img/nitta/bg.jpg (100%) rename {assets => src/assets}/img/ochiai/avator.jpg (100%) rename {assets => src/assets}/img/ochiai/bg.jpg (100%) rename {assets => src/assets}/img/ohtsuka/avator.png (100%) rename {assets => src/assets}/img/ohtsuka/bg.jpg (100%) rename {assets => src/assets}/img/original/chanyou/avator.jpg (100%) rename {assets => src/assets}/img/original/chanyou/bg.jpg (100%) rename {assets => src/assets}/img/original/kaneko/avator.jpg (100%) rename {assets => src/assets}/img/original/kaneko/bg.jpg (100%) rename {assets => src/assets}/img/original/koba/avator.png (100%) rename {assets => src/assets}/img/original/koba/bg.jpg (100%) rename {assets => src/assets}/img/original/miyamoto/avator.jpg (100%) rename {assets => src/assets}/img/original/miyamoto/bg.jpg (100%) rename {assets => src/assets}/img/original/mori/avator.jpg (100%) rename {assets => src/assets}/img/original/mori/bg.jpg (100%) rename {assets => src/assets}/img/original/mori/moribg.jpg (100%) rename {assets => src/assets}/img/original/nitta/avator.jpg (100%) rename {assets => src/assets}/img/original/nitta/bg.jpg (100%) rename {assets => src/assets}/img/original/ochiai/avator.png (100%) rename {assets => src/assets}/img/original/ochiai/bg.png (100%) rename {assets => src/assets}/img/original/ohtsuka/avator.png (100%) rename {assets => src/assets}/img/original/ohtsuka/bg.png (100%) rename {assets => src/assets}/img/original/sin/avator.jpg (100%) rename {assets => src/assets}/img/original/sin/bg.jpg (100%) rename {assets => src/assets}/img/original/sin/bg.png (100%) rename {assets => src/assets}/img/original/tommy/avator.jpg (100%) rename {assets => src/assets}/img/original/tommy/bg.jpg (100%) rename {assets => src/assets}/img/pta01.png (100%) rename {assets => src/assets}/img/sin/avator.jpg (100%) rename {assets => src/assets}/img/sin/bg.jpg (100%) rename {assets => src/assets}/img/tommy/avator.jpg (100%) rename {assets => src/assets}/img/tommy/bg.jpg (100%) rename {assets => src/assets}/img/top01_img.jpg (100%) rename {assets => src/assets}/js/buttoncontrol.js (100%) rename {assets => src/assets}/js/geolocaton.js (100%) rename {assets => src/assets}/js/gps.js (100%) rename {assets => src/assets}/js/main.js (100%) rename {assets => src/assets}/js/map-design.js (100%) rename {assets => src/assets}/js/popup.js (100%) rename {assets => src/assets}/js/view.js (100%) rename {assets => src/assets}/layers/base.js (100%) rename {assets => src/assets}/layers/overlay.js (100%) rename {assets => src/assets}/libs/bootstrap.min.js (100%) rename {assets => src/assets}/libs/jquery.min.js (100%) rename {assets => src/assets}/libs/ol-hash.js (100%) rename {assets => src/assets}/libs/ol/ol.css (100%) rename {assets => src/assets}/libs/ol/ol.js (100%) rename {assets => src/assets}/libs/ol3-ext.css (100%) rename {assets => src/assets}/libs/ol3-ext_popupoverlay/popupoverlay.css (100%) rename {assets => src/assets}/libs/ol3-ext_popupoverlay/popupoverlay.js (100%) rename {assets => src/assets}/libs/ol3-layerswitcher/ol3-layerswitcher.css (100%) rename {assets => src/assets}/libs/ol3-layerswitcher/ol3-layerswitcher.js (100%) rename {assets => src/assets}/libs/ol3-search/searchcontrol.css (100%) rename {assets => src/assets}/libs/ol3-search/searchcontrol.js (100%) rename {assets => src/assets}/libs/ol3-search/searchfeaturecontrol.js (100%) rename {assets => src/assets}/tiles2/17/113809/52253.png (100%) rename {assets => src/assets}/tiles2/17/113809/52254.png (100%) rename {assets => src/assets}/tiles2/17/113809/52255.png (100%) rename {assets => src/assets}/tiles2/17/113809/52256.png (100%) rename {assets => src/assets}/tiles2/17/113809/52257.png (100%) rename {assets => src/assets}/tiles2/17/113809/52258.png (100%) rename {assets => src/assets}/tiles2/17/113809/52259.png (100%) rename {assets => src/assets}/tiles2/17/113809/52260.png (100%) rename {assets => src/assets}/tiles2/17/113810/52253.png (100%) rename {assets => src/assets}/tiles2/17/113810/52254.png (100%) rename {assets => src/assets}/tiles2/17/113810/52255.png (100%) rename {assets => src/assets}/tiles2/17/113810/52256.png (100%) rename {assets => src/assets}/tiles2/17/113810/52257.png (100%) rename {assets => src/assets}/tiles2/17/113810/52258.png (100%) rename {assets => src/assets}/tiles2/17/113810/52259.png (100%) rename {assets => src/assets}/tiles2/17/113810/52260.png (100%) rename {assets => src/assets}/tiles2/17/113811/52255.png (100%) rename {assets => src/assets}/tiles2/17/113811/52256.png (100%) rename {assets => src/assets}/tiles2/17/113811/52257.png (100%) rename {assets => src/assets}/tiles2/17/113811/52258.png (100%) rename {assets => src/assets}/tiles2/17/113812/52255.png (100%) rename {assets => src/assets}/tiles2/17/113812/52256.png (100%) rename {assets => src/assets}/tiles2/17/113812/52257.png (100%) rename {assets => src/assets}/tiles2/17/113812/52258.png (100%) rename {assets => src/assets}/tiles2/17/113813/52255.png (100%) rename {assets => src/assets}/tiles2/17/113813/52256.png (100%) rename {assets => src/assets}/tiles2/17/113813/52257.png (100%) rename {assets => src/assets}/tiles2/17/113813/52258.png (100%) rename {assets => src/assets}/tiles2/17/113814/52255.png (100%) rename {assets => src/assets}/tiles2/17/113814/52256.png (100%) rename {assets => src/assets}/tiles2/17/113814/52257.png (100%) rename {assets => src/assets}/tiles2/17/113814/52258.png (100%) rename {assets => src/assets}/tiles2/17/113815/52255.png (100%) rename {assets => src/assets}/tiles2/17/113815/52256.png (100%) rename {assets => src/assets}/tiles2/17/113815/52257.png (100%) rename {assets => src/assets}/tiles2/17/113815/52258.png (100%) rename {assets => src/assets}/tiles2/17/113816/52255.png (100%) rename {assets => src/assets}/tiles2/17/113816/52256.png (100%) rename {assets => src/assets}/tiles2/17/113816/52257.png (100%) rename {assets => src/assets}/tiles2/17/113816/52258.png (100%) rename {assets => src/assets}/tiles2/17/113817/52255.png (100%) rename {assets => src/assets}/tiles2/17/113817/52256.png (100%) rename {assets => src/assets}/tiles2/17/113817/52257.png (100%) rename {assets => src/assets}/tiles2/17/113817/52258.png (100%) rename {assets => src/assets}/tiles2/17/113818/52253.png (100%) rename {assets => src/assets}/tiles2/17/113818/52254.png (100%) rename {assets => src/assets}/tiles2/17/113818/52255.png (100%) rename {assets => src/assets}/tiles2/17/113818/52256.png (100%) rename {assets => src/assets}/tiles2/17/113818/52257.png (100%) rename {assets => src/assets}/tiles2/17/113818/52258.png (100%) rename {assets => src/assets}/tiles2/17/113818/52259.png (100%) rename {assets => src/assets}/tiles2/17/113818/52260.png (100%) rename {assets => src/assets}/tiles2/17/113819/52253.png (100%) rename {assets => src/assets}/tiles2/17/113819/52254.png (100%) rename {assets => src/assets}/tiles2/17/113819/52255.png (100%) rename {assets => src/assets}/tiles2/17/113819/52256.png (100%) rename {assets => src/assets}/tiles2/17/113819/52257.png (100%) rename {assets => src/assets}/tiles2/17/113819/52259.png (100%) rename {assets => src/assets}/tiles2/17/113819/52260.png (100%) rename history.html => src/history.html (100%) rename index.html => src/index.html (100%) rename manual.html => src/manual.html (100%) rename map.html => src/map.html (100%) diff --git a/assets/css/font-awesome/HELP-US-OUT.txt b/assets/css/font-awesome/HELP-US-OUT.txt deleted file mode 100644 index 83d083d..0000000 --- a/assets/css/font-awesome/HELP-US-OUT.txt +++ /dev/null @@ -1,7 +0,0 @@ -I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project, -Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome, -comprehensive icon sets or copy and paste your own. - -Please. Check it out. - --Dave Gandy diff --git a/assets/css/font-awesome/scss/_animated.scss b/assets/css/font-awesome/scss/_animated.scss deleted file mode 100644 index 8a020db..0000000 --- a/assets/css/font-awesome/scss/_animated.scss +++ /dev/null @@ -1,34 +0,0 @@ -// Spinning Icons -// -------------------------- - -.#{$fa-css-prefix}-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} - -.#{$fa-css-prefix}-pulse { - -webkit-animation: fa-spin 1s infinite steps(8); - animation: fa-spin 1s infinite steps(8); -} - -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} diff --git a/assets/css/font-awesome/scss/_bordered-pulled.scss b/assets/css/font-awesome/scss/_bordered-pulled.scss deleted file mode 100644 index d4b85a0..0000000 --- a/assets/css/font-awesome/scss/_bordered-pulled.scss +++ /dev/null @@ -1,25 +0,0 @@ -// Bordered & Pulled -// ------------------------- - -.#{$fa-css-prefix}-border { - padding: .2em .25em .15em; - border: solid .08em $fa-border-color; - border-radius: .1em; -} - -.#{$fa-css-prefix}-pull-left { float: left; } -.#{$fa-css-prefix}-pull-right { float: right; } - -.#{$fa-css-prefix} { - &.#{$fa-css-prefix}-pull-left { margin-right: .3em; } - &.#{$fa-css-prefix}-pull-right { margin-left: .3em; } -} - -/* Deprecated as of 4.4.0 */ -.pull-right { float: right; } -.pull-left { float: left; } - -.#{$fa-css-prefix} { - &.pull-left { margin-right: .3em; } - &.pull-right { margin-left: .3em; } -} diff --git a/assets/css/font-awesome/scss/_core.scss b/assets/css/font-awesome/scss/_core.scss deleted file mode 100644 index 7425ef8..0000000 --- a/assets/css/font-awesome/scss/_core.scss +++ /dev/null @@ -1,12 +0,0 @@ -// Base Class Definition -// ------------------------- - -.#{$fa-css-prefix} { - display: inline-block; - font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - -} diff --git a/assets/css/font-awesome/scss/_fixed-width.scss b/assets/css/font-awesome/scss/_fixed-width.scss deleted file mode 100644 index b221c98..0000000 --- a/assets/css/font-awesome/scss/_fixed-width.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Fixed Width Icons -// ------------------------- -.#{$fa-css-prefix}-fw { - width: (18em / 14); - text-align: center; -} diff --git a/assets/css/font-awesome/scss/_icons.scss b/assets/css/font-awesome/scss/_icons.scss deleted file mode 100644 index e63e702..0000000 --- a/assets/css/font-awesome/scss/_icons.scss +++ /dev/null @@ -1,789 +0,0 @@ -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ - -.#{$fa-css-prefix}-glass:before { content: $fa-var-glass; } -.#{$fa-css-prefix}-music:before { content: $fa-var-music; } -.#{$fa-css-prefix}-search:before { content: $fa-var-search; } -.#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; } -.#{$fa-css-prefix}-heart:before { content: $fa-var-heart; } -.#{$fa-css-prefix}-star:before { content: $fa-var-star; } -.#{$fa-css-prefix}-star-o:before { content: $fa-var-star-o; } -.#{$fa-css-prefix}-user:before { content: $fa-var-user; } -.#{$fa-css-prefix}-film:before { content: $fa-var-film; } -.#{$fa-css-prefix}-th-large:before { content: $fa-var-th-large; } -.#{$fa-css-prefix}-th:before { content: $fa-var-th; } -.#{$fa-css-prefix}-th-list:before { content: $fa-var-th-list; } -.#{$fa-css-prefix}-check:before { content: $fa-var-check; } -.#{$fa-css-prefix}-remove:before, -.#{$fa-css-prefix}-close:before, -.#{$fa-css-prefix}-times:before { content: $fa-var-times; } -.#{$fa-css-prefix}-search-plus:before { content: $fa-var-search-plus; } -.#{$fa-css-prefix}-search-minus:before { content: $fa-var-search-minus; } -.#{$fa-css-prefix}-power-off:before { content: $fa-var-power-off; } -.#{$fa-css-prefix}-signal:before { content: $fa-var-signal; } -.#{$fa-css-prefix}-gear:before, -.#{$fa-css-prefix}-cog:before { content: $fa-var-cog; } -.#{$fa-css-prefix}-trash-o:before { content: $fa-var-trash-o; } -.#{$fa-css-prefix}-home:before { content: $fa-var-home; } -.#{$fa-css-prefix}-file-o:before { content: $fa-var-file-o; } -.#{$fa-css-prefix}-clock-o:before { content: $fa-var-clock-o; } -.#{$fa-css-prefix}-road:before { content: $fa-var-road; } -.#{$fa-css-prefix}-download:before { content: $fa-var-download; } -.#{$fa-css-prefix}-arrow-circle-o-down:before { content: $fa-var-arrow-circle-o-down; } -.#{$fa-css-prefix}-arrow-circle-o-up:before { content: $fa-var-arrow-circle-o-up; } -.#{$fa-css-prefix}-inbox:before { content: $fa-var-inbox; } -.#{$fa-css-prefix}-play-circle-o:before { content: $fa-var-play-circle-o; } -.#{$fa-css-prefix}-rotate-right:before, -.#{$fa-css-prefix}-repeat:before { content: $fa-var-repeat; } -.#{$fa-css-prefix}-refresh:before { content: $fa-var-refresh; } -.#{$fa-css-prefix}-list-alt:before { content: $fa-var-list-alt; } -.#{$fa-css-prefix}-lock:before { content: $fa-var-lock; } -.#{$fa-css-prefix}-flag:before { content: $fa-var-flag; } -.#{$fa-css-prefix}-headphones:before { content: $fa-var-headphones; } -.#{$fa-css-prefix}-volume-off:before { content: $fa-var-volume-off; } -.#{$fa-css-prefix}-volume-down:before { content: $fa-var-volume-down; } -.#{$fa-css-prefix}-volume-up:before { content: $fa-var-volume-up; } -.#{$fa-css-prefix}-qrcode:before { content: $fa-var-qrcode; } -.#{$fa-css-prefix}-barcode:before { content: $fa-var-barcode; } -.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; } -.#{$fa-css-prefix}-tags:before { content: $fa-var-tags; } -.#{$fa-css-prefix}-book:before { content: $fa-var-book; } -.#{$fa-css-prefix}-bookmark:before { content: $fa-var-bookmark; } -.#{$fa-css-prefix}-print:before { content: $fa-var-print; } -.#{$fa-css-prefix}-camera:before { content: $fa-var-camera; } -.#{$fa-css-prefix}-font:before { content: $fa-var-font; } -.#{$fa-css-prefix}-bold:before { content: $fa-var-bold; } -.#{$fa-css-prefix}-italic:before { content: $fa-var-italic; } -.#{$fa-css-prefix}-text-height:before { content: $fa-var-text-height; } -.#{$fa-css-prefix}-text-width:before { content: $fa-var-text-width; } -.#{$fa-css-prefix}-align-left:before { content: $fa-var-align-left; } -.#{$fa-css-prefix}-align-center:before { content: $fa-var-align-center; } -.#{$fa-css-prefix}-align-right:before { content: $fa-var-align-right; } -.#{$fa-css-prefix}-align-justify:before { content: $fa-var-align-justify; } -.#{$fa-css-prefix}-list:before { content: $fa-var-list; } -.#{$fa-css-prefix}-dedent:before, -.#{$fa-css-prefix}-outdent:before { content: $fa-var-outdent; } -.#{$fa-css-prefix}-indent:before { content: $fa-var-indent; } -.#{$fa-css-prefix}-video-camera:before { content: $fa-var-video-camera; } -.#{$fa-css-prefix}-photo:before, -.#{$fa-css-prefix}-image:before, -.#{$fa-css-prefix}-picture-o:before { content: $fa-var-picture-o; } -.#{$fa-css-prefix}-pencil:before { content: $fa-var-pencil; } -.#{$fa-css-prefix}-map-marker:before { content: $fa-var-map-marker; } -.#{$fa-css-prefix}-adjust:before { content: $fa-var-adjust; } -.#{$fa-css-prefix}-tint:before { content: $fa-var-tint; } -.#{$fa-css-prefix}-edit:before, -.#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; } -.#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; } -.#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; } -.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; } -.#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; } -.#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; } -.#{$fa-css-prefix}-backward:before { content: $fa-var-backward; } -.#{$fa-css-prefix}-play:before { content: $fa-var-play; } -.#{$fa-css-prefix}-pause:before { content: $fa-var-pause; } -.#{$fa-css-prefix}-stop:before { content: $fa-var-stop; } -.#{$fa-css-prefix}-forward:before { content: $fa-var-forward; } -.#{$fa-css-prefix}-fast-forward:before { content: $fa-var-fast-forward; } -.#{$fa-css-prefix}-step-forward:before { content: $fa-var-step-forward; } -.#{$fa-css-prefix}-eject:before { content: $fa-var-eject; } -.#{$fa-css-prefix}-chevron-left:before { content: $fa-var-chevron-left; } -.#{$fa-css-prefix}-chevron-right:before { content: $fa-var-chevron-right; } -.#{$fa-css-prefix}-plus-circle:before { content: $fa-var-plus-circle; } -.#{$fa-css-prefix}-minus-circle:before { content: $fa-var-minus-circle; } -.#{$fa-css-prefix}-times-circle:before { content: $fa-var-times-circle; } -.#{$fa-css-prefix}-check-circle:before { content: $fa-var-check-circle; } -.#{$fa-css-prefix}-question-circle:before { content: $fa-var-question-circle; } -.#{$fa-css-prefix}-info-circle:before { content: $fa-var-info-circle; } -.#{$fa-css-prefix}-crosshairs:before { content: $fa-var-crosshairs; } -.#{$fa-css-prefix}-times-circle-o:before { content: $fa-var-times-circle-o; } -.#{$fa-css-prefix}-check-circle-o:before { content: $fa-var-check-circle-o; } -.#{$fa-css-prefix}-ban:before { content: $fa-var-ban; } -.#{$fa-css-prefix}-arrow-left:before { content: $fa-var-arrow-left; } -.#{$fa-css-prefix}-arrow-right:before { content: $fa-var-arrow-right; } -.#{$fa-css-prefix}-arrow-up:before { content: $fa-var-arrow-up; } -.#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; } -.#{$fa-css-prefix}-mail-forward:before, -.#{$fa-css-prefix}-share:before { content: $fa-var-share; } -.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; } -.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; } -.#{$fa-css-prefix}-plus:before { content: $fa-var-plus; } -.#{$fa-css-prefix}-minus:before { content: $fa-var-minus; } -.#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; } -.#{$fa-css-prefix}-exclamation-circle:before { content: $fa-var-exclamation-circle; } -.#{$fa-css-prefix}-gift:before { content: $fa-var-gift; } -.#{$fa-css-prefix}-leaf:before { content: $fa-var-leaf; } -.#{$fa-css-prefix}-fire:before { content: $fa-var-fire; } -.#{$fa-css-prefix}-eye:before { content: $fa-var-eye; } -.#{$fa-css-prefix}-eye-slash:before { content: $fa-var-eye-slash; } -.#{$fa-css-prefix}-warning:before, -.#{$fa-css-prefix}-exclamation-triangle:before { content: $fa-var-exclamation-triangle; } -.#{$fa-css-prefix}-plane:before { content: $fa-var-plane; } -.#{$fa-css-prefix}-calendar:before { content: $fa-var-calendar; } -.#{$fa-css-prefix}-random:before { content: $fa-var-random; } -.#{$fa-css-prefix}-comment:before { content: $fa-var-comment; } -.#{$fa-css-prefix}-magnet:before { content: $fa-var-magnet; } -.#{$fa-css-prefix}-chevron-up:before { content: $fa-var-chevron-up; } -.#{$fa-css-prefix}-chevron-down:before { content: $fa-var-chevron-down; } -.#{$fa-css-prefix}-retweet:before { content: $fa-var-retweet; } -.#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; } -.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; } -.#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; } -.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; } -.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; } -.#{$fa-css-prefix}-bar-chart-o:before, -.#{$fa-css-prefix}-bar-chart:before { content: $fa-var-bar-chart; } -.#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; } -.#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; } -.#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; } -.#{$fa-css-prefix}-key:before { content: $fa-var-key; } -.#{$fa-css-prefix}-gears:before, -.#{$fa-css-prefix}-cogs:before { content: $fa-var-cogs; } -.#{$fa-css-prefix}-comments:before { content: $fa-var-comments; } -.#{$fa-css-prefix}-thumbs-o-up:before { content: $fa-var-thumbs-o-up; } -.#{$fa-css-prefix}-thumbs-o-down:before { content: $fa-var-thumbs-o-down; } -.#{$fa-css-prefix}-star-half:before { content: $fa-var-star-half; } -.#{$fa-css-prefix}-heart-o:before { content: $fa-var-heart-o; } -.#{$fa-css-prefix}-sign-out:before { content: $fa-var-sign-out; } -.#{$fa-css-prefix}-linkedin-square:before { content: $fa-var-linkedin-square; } -.#{$fa-css-prefix}-thumb-tack:before { content: $fa-var-thumb-tack; } -.#{$fa-css-prefix}-external-link:before { content: $fa-var-external-link; } -.#{$fa-css-prefix}-sign-in:before { content: $fa-var-sign-in; } -.#{$fa-css-prefix}-trophy:before { content: $fa-var-trophy; } -.#{$fa-css-prefix}-github-square:before { content: $fa-var-github-square; } -.#{$fa-css-prefix}-upload:before { content: $fa-var-upload; } -.#{$fa-css-prefix}-lemon-o:before { content: $fa-var-lemon-o; } -.#{$fa-css-prefix}-phone:before { content: $fa-var-phone; } -.#{$fa-css-prefix}-square-o:before { content: $fa-var-square-o; } -.#{$fa-css-prefix}-bookmark-o:before { content: $fa-var-bookmark-o; } -.#{$fa-css-prefix}-phone-square:before { content: $fa-var-phone-square; } -.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; } -.#{$fa-css-prefix}-facebook-f:before, -.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; } -.#{$fa-css-prefix}-github:before { content: $fa-var-github; } -.#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; } -.#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; } -.#{$fa-css-prefix}-feed:before, -.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; } -.#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; } -.#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; } -.#{$fa-css-prefix}-bell:before { content: $fa-var-bell; } -.#{$fa-css-prefix}-certificate:before { content: $fa-var-certificate; } -.#{$fa-css-prefix}-hand-o-right:before { content: $fa-var-hand-o-right; } -.#{$fa-css-prefix}-hand-o-left:before { content: $fa-var-hand-o-left; } -.#{$fa-css-prefix}-hand-o-up:before { content: $fa-var-hand-o-up; } -.#{$fa-css-prefix}-hand-o-down:before { content: $fa-var-hand-o-down; } -.#{$fa-css-prefix}-arrow-circle-left:before { content: $fa-var-arrow-circle-left; } -.#{$fa-css-prefix}-arrow-circle-right:before { content: $fa-var-arrow-circle-right; } -.#{$fa-css-prefix}-arrow-circle-up:before { content: $fa-var-arrow-circle-up; } -.#{$fa-css-prefix}-arrow-circle-down:before { content: $fa-var-arrow-circle-down; } -.#{$fa-css-prefix}-globe:before { content: $fa-var-globe; } -.#{$fa-css-prefix}-wrench:before { content: $fa-var-wrench; } -.#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; } -.#{$fa-css-prefix}-filter:before { content: $fa-var-filter; } -.#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; } -.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; } -.#{$fa-css-prefix}-group:before, -.#{$fa-css-prefix}-users:before { content: $fa-var-users; } -.#{$fa-css-prefix}-chain:before, -.#{$fa-css-prefix}-link:before { content: $fa-var-link; } -.#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; } -.#{$fa-css-prefix}-flask:before { content: $fa-var-flask; } -.#{$fa-css-prefix}-cut:before, -.#{$fa-css-prefix}-scissors:before { content: $fa-var-scissors; } -.#{$fa-css-prefix}-copy:before, -.#{$fa-css-prefix}-files-o:before { content: $fa-var-files-o; } -.#{$fa-css-prefix}-paperclip:before { content: $fa-var-paperclip; } -.#{$fa-css-prefix}-save:before, -.#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; } -.#{$fa-css-prefix}-square:before { content: $fa-var-square; } -.#{$fa-css-prefix}-navicon:before, -.#{$fa-css-prefix}-reorder:before, -.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; } -.#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; } -.#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; } -.#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; } -.#{$fa-css-prefix}-underline:before { content: $fa-var-underline; } -.#{$fa-css-prefix}-table:before { content: $fa-var-table; } -.#{$fa-css-prefix}-magic:before { content: $fa-var-magic; } -.#{$fa-css-prefix}-truck:before { content: $fa-var-truck; } -.#{$fa-css-prefix}-pinterest:before { content: $fa-var-pinterest; } -.#{$fa-css-prefix}-pinterest-square:before { content: $fa-var-pinterest-square; } -.#{$fa-css-prefix}-google-plus-square:before { content: $fa-var-google-plus-square; } -.#{$fa-css-prefix}-google-plus:before { content: $fa-var-google-plus; } -.#{$fa-css-prefix}-money:before { content: $fa-var-money; } -.#{$fa-css-prefix}-caret-down:before { content: $fa-var-caret-down; } -.#{$fa-css-prefix}-caret-up:before { content: $fa-var-caret-up; } -.#{$fa-css-prefix}-caret-left:before { content: $fa-var-caret-left; } -.#{$fa-css-prefix}-caret-right:before { content: $fa-var-caret-right; } -.#{$fa-css-prefix}-columns:before { content: $fa-var-columns; } -.#{$fa-css-prefix}-unsorted:before, -.#{$fa-css-prefix}-sort:before { content: $fa-var-sort; } -.#{$fa-css-prefix}-sort-down:before, -.#{$fa-css-prefix}-sort-desc:before { content: $fa-var-sort-desc; } -.#{$fa-css-prefix}-sort-up:before, -.#{$fa-css-prefix}-sort-asc:before { content: $fa-var-sort-asc; } -.#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; } -.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; } -.#{$fa-css-prefix}-rotate-left:before, -.#{$fa-css-prefix}-undo:before { content: $fa-var-undo; } -.#{$fa-css-prefix}-legal:before, -.#{$fa-css-prefix}-gavel:before { content: $fa-var-gavel; } -.#{$fa-css-prefix}-dashboard:before, -.#{$fa-css-prefix}-tachometer:before { content: $fa-var-tachometer; } -.#{$fa-css-prefix}-comment-o:before { content: $fa-var-comment-o; } -.#{$fa-css-prefix}-comments-o:before { content: $fa-var-comments-o; } -.#{$fa-css-prefix}-flash:before, -.#{$fa-css-prefix}-bolt:before { content: $fa-var-bolt; } -.#{$fa-css-prefix}-sitemap:before { content: $fa-var-sitemap; } -.#{$fa-css-prefix}-umbrella:before { content: $fa-var-umbrella; } -.#{$fa-css-prefix}-paste:before, -.#{$fa-css-prefix}-clipboard:before { content: $fa-var-clipboard; } -.#{$fa-css-prefix}-lightbulb-o:before { content: $fa-var-lightbulb-o; } -.#{$fa-css-prefix}-exchange:before { content: $fa-var-exchange; } -.#{$fa-css-prefix}-cloud-download:before { content: $fa-var-cloud-download; } -.#{$fa-css-prefix}-cloud-upload:before { content: $fa-var-cloud-upload; } -.#{$fa-css-prefix}-user-md:before { content: $fa-var-user-md; } -.#{$fa-css-prefix}-stethoscope:before { content: $fa-var-stethoscope; } -.#{$fa-css-prefix}-suitcase:before { content: $fa-var-suitcase; } -.#{$fa-css-prefix}-bell-o:before { content: $fa-var-bell-o; } -.#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; } -.#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; } -.#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; } -.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; } -.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; } -.#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; } -.#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; } -.#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; } -.#{$fa-css-prefix}-beer:before { content: $fa-var-beer; } -.#{$fa-css-prefix}-h-square:before { content: $fa-var-h-square; } -.#{$fa-css-prefix}-plus-square:before { content: $fa-var-plus-square; } -.#{$fa-css-prefix}-angle-double-left:before { content: $fa-var-angle-double-left; } -.#{$fa-css-prefix}-angle-double-right:before { content: $fa-var-angle-double-right; } -.#{$fa-css-prefix}-angle-double-up:before { content: $fa-var-angle-double-up; } -.#{$fa-css-prefix}-angle-double-down:before { content: $fa-var-angle-double-down; } -.#{$fa-css-prefix}-angle-left:before { content: $fa-var-angle-left; } -.#{$fa-css-prefix}-angle-right:before { content: $fa-var-angle-right; } -.#{$fa-css-prefix}-angle-up:before { content: $fa-var-angle-up; } -.#{$fa-css-prefix}-angle-down:before { content: $fa-var-angle-down; } -.#{$fa-css-prefix}-desktop:before { content: $fa-var-desktop; } -.#{$fa-css-prefix}-laptop:before { content: $fa-var-laptop; } -.#{$fa-css-prefix}-tablet:before { content: $fa-var-tablet; } -.#{$fa-css-prefix}-mobile-phone:before, -.#{$fa-css-prefix}-mobile:before { content: $fa-var-mobile; } -.#{$fa-css-prefix}-circle-o:before { content: $fa-var-circle-o; } -.#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; } -.#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; } -.#{$fa-css-prefix}-spinner:before { content: $fa-var-spinner; } -.#{$fa-css-prefix}-circle:before { content: $fa-var-circle; } -.#{$fa-css-prefix}-mail-reply:before, -.#{$fa-css-prefix}-reply:before { content: $fa-var-reply; } -.#{$fa-css-prefix}-github-alt:before { content: $fa-var-github-alt; } -.#{$fa-css-prefix}-folder-o:before { content: $fa-var-folder-o; } -.#{$fa-css-prefix}-folder-open-o:before { content: $fa-var-folder-open-o; } -.#{$fa-css-prefix}-smile-o:before { content: $fa-var-smile-o; } -.#{$fa-css-prefix}-frown-o:before { content: $fa-var-frown-o; } -.#{$fa-css-prefix}-meh-o:before { content: $fa-var-meh-o; } -.#{$fa-css-prefix}-gamepad:before { content: $fa-var-gamepad; } -.#{$fa-css-prefix}-keyboard-o:before { content: $fa-var-keyboard-o; } -.#{$fa-css-prefix}-flag-o:before { content: $fa-var-flag-o; } -.#{$fa-css-prefix}-flag-checkered:before { content: $fa-var-flag-checkered; } -.#{$fa-css-prefix}-terminal:before { content: $fa-var-terminal; } -.#{$fa-css-prefix}-code:before { content: $fa-var-code; } -.#{$fa-css-prefix}-mail-reply-all:before, -.#{$fa-css-prefix}-reply-all:before { content: $fa-var-reply-all; } -.#{$fa-css-prefix}-star-half-empty:before, -.#{$fa-css-prefix}-star-half-full:before, -.#{$fa-css-prefix}-star-half-o:before { content: $fa-var-star-half-o; } -.#{$fa-css-prefix}-location-arrow:before { content: $fa-var-location-arrow; } -.#{$fa-css-prefix}-crop:before { content: $fa-var-crop; } -.#{$fa-css-prefix}-code-fork:before { content: $fa-var-code-fork; } -.#{$fa-css-prefix}-unlink:before, -.#{$fa-css-prefix}-chain-broken:before { content: $fa-var-chain-broken; } -.#{$fa-css-prefix}-question:before { content: $fa-var-question; } -.#{$fa-css-prefix}-info:before { content: $fa-var-info; } -.#{$fa-css-prefix}-exclamation:before { content: $fa-var-exclamation; } -.#{$fa-css-prefix}-superscript:before { content: $fa-var-superscript; } -.#{$fa-css-prefix}-subscript:before { content: $fa-var-subscript; } -.#{$fa-css-prefix}-eraser:before { content: $fa-var-eraser; } -.#{$fa-css-prefix}-puzzle-piece:before { content: $fa-var-puzzle-piece; } -.#{$fa-css-prefix}-microphone:before { content: $fa-var-microphone; } -.#{$fa-css-prefix}-microphone-slash:before { content: $fa-var-microphone-slash; } -.#{$fa-css-prefix}-shield:before { content: $fa-var-shield; } -.#{$fa-css-prefix}-calendar-o:before { content: $fa-var-calendar-o; } -.#{$fa-css-prefix}-fire-extinguisher:before { content: $fa-var-fire-extinguisher; } -.#{$fa-css-prefix}-rocket:before { content: $fa-var-rocket; } -.#{$fa-css-prefix}-maxcdn:before { content: $fa-var-maxcdn; } -.#{$fa-css-prefix}-chevron-circle-left:before { content: $fa-var-chevron-circle-left; } -.#{$fa-css-prefix}-chevron-circle-right:before { content: $fa-var-chevron-circle-right; } -.#{$fa-css-prefix}-chevron-circle-up:before { content: $fa-var-chevron-circle-up; } -.#{$fa-css-prefix}-chevron-circle-down:before { content: $fa-var-chevron-circle-down; } -.#{$fa-css-prefix}-html5:before { content: $fa-var-html5; } -.#{$fa-css-prefix}-css3:before { content: $fa-var-css3; } -.#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; } -.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; } -.#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; } -.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; } -.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; } -.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; } -.#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; } -.#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; } -.#{$fa-css-prefix}-minus-square:before { content: $fa-var-minus-square; } -.#{$fa-css-prefix}-minus-square-o:before { content: $fa-var-minus-square-o; } -.#{$fa-css-prefix}-level-up:before { content: $fa-var-level-up; } -.#{$fa-css-prefix}-level-down:before { content: $fa-var-level-down; } -.#{$fa-css-prefix}-check-square:before { content: $fa-var-check-square; } -.#{$fa-css-prefix}-pencil-square:before { content: $fa-var-pencil-square; } -.#{$fa-css-prefix}-external-link-square:before { content: $fa-var-external-link-square; } -.#{$fa-css-prefix}-share-square:before { content: $fa-var-share-square; } -.#{$fa-css-prefix}-compass:before { content: $fa-var-compass; } -.#{$fa-css-prefix}-toggle-down:before, -.#{$fa-css-prefix}-caret-square-o-down:before { content: $fa-var-caret-square-o-down; } -.#{$fa-css-prefix}-toggle-up:before, -.#{$fa-css-prefix}-caret-square-o-up:before { content: $fa-var-caret-square-o-up; } -.#{$fa-css-prefix}-toggle-right:before, -.#{$fa-css-prefix}-caret-square-o-right:before { content: $fa-var-caret-square-o-right; } -.#{$fa-css-prefix}-euro:before, -.#{$fa-css-prefix}-eur:before { content: $fa-var-eur; } -.#{$fa-css-prefix}-gbp:before { content: $fa-var-gbp; } -.#{$fa-css-prefix}-dollar:before, -.#{$fa-css-prefix}-usd:before { content: $fa-var-usd; } -.#{$fa-css-prefix}-rupee:before, -.#{$fa-css-prefix}-inr:before { content: $fa-var-inr; } -.#{$fa-css-prefix}-cny:before, -.#{$fa-css-prefix}-rmb:before, -.#{$fa-css-prefix}-yen:before, -.#{$fa-css-prefix}-jpy:before { content: $fa-var-jpy; } -.#{$fa-css-prefix}-ruble:before, -.#{$fa-css-prefix}-rouble:before, -.#{$fa-css-prefix}-rub:before { content: $fa-var-rub; } -.#{$fa-css-prefix}-won:before, -.#{$fa-css-prefix}-krw:before { content: $fa-var-krw; } -.#{$fa-css-prefix}-bitcoin:before, -.#{$fa-css-prefix}-btc:before { content: $fa-var-btc; } -.#{$fa-css-prefix}-file:before { content: $fa-var-file; } -.#{$fa-css-prefix}-file-text:before { content: $fa-var-file-text; } -.#{$fa-css-prefix}-sort-alpha-asc:before { content: $fa-var-sort-alpha-asc; } -.#{$fa-css-prefix}-sort-alpha-desc:before { content: $fa-var-sort-alpha-desc; } -.#{$fa-css-prefix}-sort-amount-asc:before { content: $fa-var-sort-amount-asc; } -.#{$fa-css-prefix}-sort-amount-desc:before { content: $fa-var-sort-amount-desc; } -.#{$fa-css-prefix}-sort-numeric-asc:before { content: $fa-var-sort-numeric-asc; } -.#{$fa-css-prefix}-sort-numeric-desc:before { content: $fa-var-sort-numeric-desc; } -.#{$fa-css-prefix}-thumbs-up:before { content: $fa-var-thumbs-up; } -.#{$fa-css-prefix}-thumbs-down:before { content: $fa-var-thumbs-down; } -.#{$fa-css-prefix}-youtube-square:before { content: $fa-var-youtube-square; } -.#{$fa-css-prefix}-youtube:before { content: $fa-var-youtube; } -.#{$fa-css-prefix}-xing:before { content: $fa-var-xing; } -.#{$fa-css-prefix}-xing-square:before { content: $fa-var-xing-square; } -.#{$fa-css-prefix}-youtube-play:before { content: $fa-var-youtube-play; } -.#{$fa-css-prefix}-dropbox:before { content: $fa-var-dropbox; } -.#{$fa-css-prefix}-stack-overflow:before { content: $fa-var-stack-overflow; } -.#{$fa-css-prefix}-instagram:before { content: $fa-var-instagram; } -.#{$fa-css-prefix}-flickr:before { content: $fa-var-flickr; } -.#{$fa-css-prefix}-adn:before { content: $fa-var-adn; } -.#{$fa-css-prefix}-bitbucket:before { content: $fa-var-bitbucket; } -.#{$fa-css-prefix}-bitbucket-square:before { content: $fa-var-bitbucket-square; } -.#{$fa-css-prefix}-tumblr:before { content: $fa-var-tumblr; } -.#{$fa-css-prefix}-tumblr-square:before { content: $fa-var-tumblr-square; } -.#{$fa-css-prefix}-long-arrow-down:before { content: $fa-var-long-arrow-down; } -.#{$fa-css-prefix}-long-arrow-up:before { content: $fa-var-long-arrow-up; } -.#{$fa-css-prefix}-long-arrow-left:before { content: $fa-var-long-arrow-left; } -.#{$fa-css-prefix}-long-arrow-right:before { content: $fa-var-long-arrow-right; } -.#{$fa-css-prefix}-apple:before { content: $fa-var-apple; } -.#{$fa-css-prefix}-windows:before { content: $fa-var-windows; } -.#{$fa-css-prefix}-android:before { content: $fa-var-android; } -.#{$fa-css-prefix}-linux:before { content: $fa-var-linux; } -.#{$fa-css-prefix}-dribbble:before { content: $fa-var-dribbble; } -.#{$fa-css-prefix}-skype:before { content: $fa-var-skype; } -.#{$fa-css-prefix}-foursquare:before { content: $fa-var-foursquare; } -.#{$fa-css-prefix}-trello:before { content: $fa-var-trello; } -.#{$fa-css-prefix}-female:before { content: $fa-var-female; } -.#{$fa-css-prefix}-male:before { content: $fa-var-male; } -.#{$fa-css-prefix}-gittip:before, -.#{$fa-css-prefix}-gratipay:before { content: $fa-var-gratipay; } -.#{$fa-css-prefix}-sun-o:before { content: $fa-var-sun-o; } -.#{$fa-css-prefix}-moon-o:before { content: $fa-var-moon-o; } -.#{$fa-css-prefix}-archive:before { content: $fa-var-archive; } -.#{$fa-css-prefix}-bug:before { content: $fa-var-bug; } -.#{$fa-css-prefix}-vk:before { content: $fa-var-vk; } -.#{$fa-css-prefix}-weibo:before { content: $fa-var-weibo; } -.#{$fa-css-prefix}-renren:before { content: $fa-var-renren; } -.#{$fa-css-prefix}-pagelines:before { content: $fa-var-pagelines; } -.#{$fa-css-prefix}-stack-exchange:before { content: $fa-var-stack-exchange; } -.#{$fa-css-prefix}-arrow-circle-o-right:before { content: $fa-var-arrow-circle-o-right; } -.#{$fa-css-prefix}-arrow-circle-o-left:before { content: $fa-var-arrow-circle-o-left; } -.#{$fa-css-prefix}-toggle-left:before, -.#{$fa-css-prefix}-caret-square-o-left:before { content: $fa-var-caret-square-o-left; } -.#{$fa-css-prefix}-dot-circle-o:before { content: $fa-var-dot-circle-o; } -.#{$fa-css-prefix}-wheelchair:before { content: $fa-var-wheelchair; } -.#{$fa-css-prefix}-vimeo-square:before { content: $fa-var-vimeo-square; } -.#{$fa-css-prefix}-turkish-lira:before, -.#{$fa-css-prefix}-try:before { content: $fa-var-try; } -.#{$fa-css-prefix}-plus-square-o:before { content: $fa-var-plus-square-o; } -.#{$fa-css-prefix}-space-shuttle:before { content: $fa-var-space-shuttle; } -.#{$fa-css-prefix}-slack:before { content: $fa-var-slack; } -.#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; } -.#{$fa-css-prefix}-wordpress:before { content: $fa-var-wordpress; } -.#{$fa-css-prefix}-openid:before { content: $fa-var-openid; } -.#{$fa-css-prefix}-institution:before, -.#{$fa-css-prefix}-bank:before, -.#{$fa-css-prefix}-university:before { content: $fa-var-university; } -.#{$fa-css-prefix}-mortar-board:before, -.#{$fa-css-prefix}-graduation-cap:before { content: $fa-var-graduation-cap; } -.#{$fa-css-prefix}-yahoo:before { content: $fa-var-yahoo; } -.#{$fa-css-prefix}-google:before { content: $fa-var-google; } -.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; } -.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; } -.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; } -.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; } -.#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; } -.#{$fa-css-prefix}-digg:before { content: $fa-var-digg; } -.#{$fa-css-prefix}-pied-piper-pp:before { content: $fa-var-pied-piper-pp; } -.#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; } -.#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; } -.#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; } -.#{$fa-css-prefix}-language:before { content: $fa-var-language; } -.#{$fa-css-prefix}-fax:before { content: $fa-var-fax; } -.#{$fa-css-prefix}-building:before { content: $fa-var-building; } -.#{$fa-css-prefix}-child:before { content: $fa-var-child; } -.#{$fa-css-prefix}-paw:before { content: $fa-var-paw; } -.#{$fa-css-prefix}-spoon:before { content: $fa-var-spoon; } -.#{$fa-css-prefix}-cube:before { content: $fa-var-cube; } -.#{$fa-css-prefix}-cubes:before { content: $fa-var-cubes; } -.#{$fa-css-prefix}-behance:before { content: $fa-var-behance; } -.#{$fa-css-prefix}-behance-square:before { content: $fa-var-behance-square; } -.#{$fa-css-prefix}-steam:before { content: $fa-var-steam; } -.#{$fa-css-prefix}-steam-square:before { content: $fa-var-steam-square; } -.#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; } -.#{$fa-css-prefix}-automobile:before, -.#{$fa-css-prefix}-car:before { content: $fa-var-car; } -.#{$fa-css-prefix}-cab:before, -.#{$fa-css-prefix}-taxi:before { content: $fa-var-taxi; } -.#{$fa-css-prefix}-tree:before { content: $fa-var-tree; } -.#{$fa-css-prefix}-spotify:before { content: $fa-var-spotify; } -.#{$fa-css-prefix}-deviantart:before { content: $fa-var-deviantart; } -.#{$fa-css-prefix}-soundcloud:before { content: $fa-var-soundcloud; } -.#{$fa-css-prefix}-database:before { content: $fa-var-database; } -.#{$fa-css-prefix}-file-pdf-o:before { content: $fa-var-file-pdf-o; } -.#{$fa-css-prefix}-file-word-o:before { content: $fa-var-file-word-o; } -.#{$fa-css-prefix}-file-excel-o:before { content: $fa-var-file-excel-o; } -.#{$fa-css-prefix}-file-powerpoint-o:before { content: $fa-var-file-powerpoint-o; } -.#{$fa-css-prefix}-file-photo-o:before, -.#{$fa-css-prefix}-file-picture-o:before, -.#{$fa-css-prefix}-file-image-o:before { content: $fa-var-file-image-o; } -.#{$fa-css-prefix}-file-zip-o:before, -.#{$fa-css-prefix}-file-archive-o:before { content: $fa-var-file-archive-o; } -.#{$fa-css-prefix}-file-sound-o:before, -.#{$fa-css-prefix}-file-audio-o:before { content: $fa-var-file-audio-o; } -.#{$fa-css-prefix}-file-movie-o:before, -.#{$fa-css-prefix}-file-video-o:before { content: $fa-var-file-video-o; } -.#{$fa-css-prefix}-file-code-o:before { content: $fa-var-file-code-o; } -.#{$fa-css-prefix}-vine:before { content: $fa-var-vine; } -.#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; } -.#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; } -.#{$fa-css-prefix}-life-bouy:before, -.#{$fa-css-prefix}-life-buoy:before, -.#{$fa-css-prefix}-life-saver:before, -.#{$fa-css-prefix}-support:before, -.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; } -.#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; } -.#{$fa-css-prefix}-ra:before, -.#{$fa-css-prefix}-resistance:before, -.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; } -.#{$fa-css-prefix}-ge:before, -.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; } -.#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; } -.#{$fa-css-prefix}-git:before { content: $fa-var-git; } -.#{$fa-css-prefix}-y-combinator-square:before, -.#{$fa-css-prefix}-yc-square:before, -.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; } -.#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; } -.#{$fa-css-prefix}-qq:before { content: $fa-var-qq; } -.#{$fa-css-prefix}-wechat:before, -.#{$fa-css-prefix}-weixin:before { content: $fa-var-weixin; } -.#{$fa-css-prefix}-send:before, -.#{$fa-css-prefix}-paper-plane:before { content: $fa-var-paper-plane; } -.#{$fa-css-prefix}-send-o:before, -.#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; } -.#{$fa-css-prefix}-history:before { content: $fa-var-history; } -.#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; } -.#{$fa-css-prefix}-header:before { content: $fa-var-header; } -.#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; } -.#{$fa-css-prefix}-sliders:before { content: $fa-var-sliders; } -.#{$fa-css-prefix}-share-alt:before { content: $fa-var-share-alt; } -.#{$fa-css-prefix}-share-alt-square:before { content: $fa-var-share-alt-square; } -.#{$fa-css-prefix}-bomb:before { content: $fa-var-bomb; } -.#{$fa-css-prefix}-soccer-ball-o:before, -.#{$fa-css-prefix}-futbol-o:before { content: $fa-var-futbol-o; } -.#{$fa-css-prefix}-tty:before { content: $fa-var-tty; } -.#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; } -.#{$fa-css-prefix}-plug:before { content: $fa-var-plug; } -.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; } -.#{$fa-css-prefix}-twitch:before { content: $fa-var-twitch; } -.#{$fa-css-prefix}-yelp:before { content: $fa-var-yelp; } -.#{$fa-css-prefix}-newspaper-o:before { content: $fa-var-newspaper-o; } -.#{$fa-css-prefix}-wifi:before { content: $fa-var-wifi; } -.#{$fa-css-prefix}-calculator:before { content: $fa-var-calculator; } -.#{$fa-css-prefix}-paypal:before { content: $fa-var-paypal; } -.#{$fa-css-prefix}-google-wallet:before { content: $fa-var-google-wallet; } -.#{$fa-css-prefix}-cc-visa:before { content: $fa-var-cc-visa; } -.#{$fa-css-prefix}-cc-mastercard:before { content: $fa-var-cc-mastercard; } -.#{$fa-css-prefix}-cc-discover:before { content: $fa-var-cc-discover; } -.#{$fa-css-prefix}-cc-amex:before { content: $fa-var-cc-amex; } -.#{$fa-css-prefix}-cc-paypal:before { content: $fa-var-cc-paypal; } -.#{$fa-css-prefix}-cc-stripe:before { content: $fa-var-cc-stripe; } -.#{$fa-css-prefix}-bell-slash:before { content: $fa-var-bell-slash; } -.#{$fa-css-prefix}-bell-slash-o:before { content: $fa-var-bell-slash-o; } -.#{$fa-css-prefix}-trash:before { content: $fa-var-trash; } -.#{$fa-css-prefix}-copyright:before { content: $fa-var-copyright; } -.#{$fa-css-prefix}-at:before { content: $fa-var-at; } -.#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; } -.#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; } -.#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; } -.#{$fa-css-prefix}-area-chart:before { content: $fa-var-area-chart; } -.#{$fa-css-prefix}-pie-chart:before { content: $fa-var-pie-chart; } -.#{$fa-css-prefix}-line-chart:before { content: $fa-var-line-chart; } -.#{$fa-css-prefix}-lastfm:before { content: $fa-var-lastfm; } -.#{$fa-css-prefix}-lastfm-square:before { content: $fa-var-lastfm-square; } -.#{$fa-css-prefix}-toggle-off:before { content: $fa-var-toggle-off; } -.#{$fa-css-prefix}-toggle-on:before { content: $fa-var-toggle-on; } -.#{$fa-css-prefix}-bicycle:before { content: $fa-var-bicycle; } -.#{$fa-css-prefix}-bus:before { content: $fa-var-bus; } -.#{$fa-css-prefix}-ioxhost:before { content: $fa-var-ioxhost; } -.#{$fa-css-prefix}-angellist:before { content: $fa-var-angellist; } -.#{$fa-css-prefix}-cc:before { content: $fa-var-cc; } -.#{$fa-css-prefix}-shekel:before, -.#{$fa-css-prefix}-sheqel:before, -.#{$fa-css-prefix}-ils:before { content: $fa-var-ils; } -.#{$fa-css-prefix}-meanpath:before { content: $fa-var-meanpath; } -.#{$fa-css-prefix}-buysellads:before { content: $fa-var-buysellads; } -.#{$fa-css-prefix}-connectdevelop:before { content: $fa-var-connectdevelop; } -.#{$fa-css-prefix}-dashcube:before { content: $fa-var-dashcube; } -.#{$fa-css-prefix}-forumbee:before { content: $fa-var-forumbee; } -.#{$fa-css-prefix}-leanpub:before { content: $fa-var-leanpub; } -.#{$fa-css-prefix}-sellsy:before { content: $fa-var-sellsy; } -.#{$fa-css-prefix}-shirtsinbulk:before { content: $fa-var-shirtsinbulk; } -.#{$fa-css-prefix}-simplybuilt:before { content: $fa-var-simplybuilt; } -.#{$fa-css-prefix}-skyatlas:before { content: $fa-var-skyatlas; } -.#{$fa-css-prefix}-cart-plus:before { content: $fa-var-cart-plus; } -.#{$fa-css-prefix}-cart-arrow-down:before { content: $fa-var-cart-arrow-down; } -.#{$fa-css-prefix}-diamond:before { content: $fa-var-diamond; } -.#{$fa-css-prefix}-ship:before { content: $fa-var-ship; } -.#{$fa-css-prefix}-user-secret:before { content: $fa-var-user-secret; } -.#{$fa-css-prefix}-motorcycle:before { content: $fa-var-motorcycle; } -.#{$fa-css-prefix}-street-view:before { content: $fa-var-street-view; } -.#{$fa-css-prefix}-heartbeat:before { content: $fa-var-heartbeat; } -.#{$fa-css-prefix}-venus:before { content: $fa-var-venus; } -.#{$fa-css-prefix}-mars:before { content: $fa-var-mars; } -.#{$fa-css-prefix}-mercury:before { content: $fa-var-mercury; } -.#{$fa-css-prefix}-intersex:before, -.#{$fa-css-prefix}-transgender:before { content: $fa-var-transgender; } -.#{$fa-css-prefix}-transgender-alt:before { content: $fa-var-transgender-alt; } -.#{$fa-css-prefix}-venus-double:before { content: $fa-var-venus-double; } -.#{$fa-css-prefix}-mars-double:before { content: $fa-var-mars-double; } -.#{$fa-css-prefix}-venus-mars:before { content: $fa-var-venus-mars; } -.#{$fa-css-prefix}-mars-stroke:before { content: $fa-var-mars-stroke; } -.#{$fa-css-prefix}-mars-stroke-v:before { content: $fa-var-mars-stroke-v; } -.#{$fa-css-prefix}-mars-stroke-h:before { content: $fa-var-mars-stroke-h; } -.#{$fa-css-prefix}-neuter:before { content: $fa-var-neuter; } -.#{$fa-css-prefix}-genderless:before { content: $fa-var-genderless; } -.#{$fa-css-prefix}-facebook-official:before { content: $fa-var-facebook-official; } -.#{$fa-css-prefix}-pinterest-p:before { content: $fa-var-pinterest-p; } -.#{$fa-css-prefix}-whatsapp:before { content: $fa-var-whatsapp; } -.#{$fa-css-prefix}-server:before { content: $fa-var-server; } -.#{$fa-css-prefix}-user-plus:before { content: $fa-var-user-plus; } -.#{$fa-css-prefix}-user-times:before { content: $fa-var-user-times; } -.#{$fa-css-prefix}-hotel:before, -.#{$fa-css-prefix}-bed:before { content: $fa-var-bed; } -.#{$fa-css-prefix}-viacoin:before { content: $fa-var-viacoin; } -.#{$fa-css-prefix}-train:before { content: $fa-var-train; } -.#{$fa-css-prefix}-subway:before { content: $fa-var-subway; } -.#{$fa-css-prefix}-medium:before { content: $fa-var-medium; } -.#{$fa-css-prefix}-yc:before, -.#{$fa-css-prefix}-y-combinator:before { content: $fa-var-y-combinator; } -.#{$fa-css-prefix}-optin-monster:before { content: $fa-var-optin-monster; } -.#{$fa-css-prefix}-opencart:before { content: $fa-var-opencart; } -.#{$fa-css-prefix}-expeditedssl:before { content: $fa-var-expeditedssl; } -.#{$fa-css-prefix}-battery-4:before, -.#{$fa-css-prefix}-battery:before, -.#{$fa-css-prefix}-battery-full:before { content: $fa-var-battery-full; } -.#{$fa-css-prefix}-battery-3:before, -.#{$fa-css-prefix}-battery-three-quarters:before { content: $fa-var-battery-three-quarters; } -.#{$fa-css-prefix}-battery-2:before, -.#{$fa-css-prefix}-battery-half:before { content: $fa-var-battery-half; } -.#{$fa-css-prefix}-battery-1:before, -.#{$fa-css-prefix}-battery-quarter:before { content: $fa-var-battery-quarter; } -.#{$fa-css-prefix}-battery-0:before, -.#{$fa-css-prefix}-battery-empty:before { content: $fa-var-battery-empty; } -.#{$fa-css-prefix}-mouse-pointer:before { content: $fa-var-mouse-pointer; } -.#{$fa-css-prefix}-i-cursor:before { content: $fa-var-i-cursor; } -.#{$fa-css-prefix}-object-group:before { content: $fa-var-object-group; } -.#{$fa-css-prefix}-object-ungroup:before { content: $fa-var-object-ungroup; } -.#{$fa-css-prefix}-sticky-note:before { content: $fa-var-sticky-note; } -.#{$fa-css-prefix}-sticky-note-o:before { content: $fa-var-sticky-note-o; } -.#{$fa-css-prefix}-cc-jcb:before { content: $fa-var-cc-jcb; } -.#{$fa-css-prefix}-cc-diners-club:before { content: $fa-var-cc-diners-club; } -.#{$fa-css-prefix}-clone:before { content: $fa-var-clone; } -.#{$fa-css-prefix}-balance-scale:before { content: $fa-var-balance-scale; } -.#{$fa-css-prefix}-hourglass-o:before { content: $fa-var-hourglass-o; } -.#{$fa-css-prefix}-hourglass-1:before, -.#{$fa-css-prefix}-hourglass-start:before { content: $fa-var-hourglass-start; } -.#{$fa-css-prefix}-hourglass-2:before, -.#{$fa-css-prefix}-hourglass-half:before { content: $fa-var-hourglass-half; } -.#{$fa-css-prefix}-hourglass-3:before, -.#{$fa-css-prefix}-hourglass-end:before { content: $fa-var-hourglass-end; } -.#{$fa-css-prefix}-hourglass:before { content: $fa-var-hourglass; } -.#{$fa-css-prefix}-hand-grab-o:before, -.#{$fa-css-prefix}-hand-rock-o:before { content: $fa-var-hand-rock-o; } -.#{$fa-css-prefix}-hand-stop-o:before, -.#{$fa-css-prefix}-hand-paper-o:before { content: $fa-var-hand-paper-o; } -.#{$fa-css-prefix}-hand-scissors-o:before { content: $fa-var-hand-scissors-o; } -.#{$fa-css-prefix}-hand-lizard-o:before { content: $fa-var-hand-lizard-o; } -.#{$fa-css-prefix}-hand-spock-o:before { content: $fa-var-hand-spock-o; } -.#{$fa-css-prefix}-hand-pointer-o:before { content: $fa-var-hand-pointer-o; } -.#{$fa-css-prefix}-hand-peace-o:before { content: $fa-var-hand-peace-o; } -.#{$fa-css-prefix}-trademark:before { content: $fa-var-trademark; } -.#{$fa-css-prefix}-registered:before { content: $fa-var-registered; } -.#{$fa-css-prefix}-creative-commons:before { content: $fa-var-creative-commons; } -.#{$fa-css-prefix}-gg:before { content: $fa-var-gg; } -.#{$fa-css-prefix}-gg-circle:before { content: $fa-var-gg-circle; } -.#{$fa-css-prefix}-tripadvisor:before { content: $fa-var-tripadvisor; } -.#{$fa-css-prefix}-odnoklassniki:before { content: $fa-var-odnoklassniki; } -.#{$fa-css-prefix}-odnoklassniki-square:before { content: $fa-var-odnoklassniki-square; } -.#{$fa-css-prefix}-get-pocket:before { content: $fa-var-get-pocket; } -.#{$fa-css-prefix}-wikipedia-w:before { content: $fa-var-wikipedia-w; } -.#{$fa-css-prefix}-safari:before { content: $fa-var-safari; } -.#{$fa-css-prefix}-chrome:before { content: $fa-var-chrome; } -.#{$fa-css-prefix}-firefox:before { content: $fa-var-firefox; } -.#{$fa-css-prefix}-opera:before { content: $fa-var-opera; } -.#{$fa-css-prefix}-internet-explorer:before { content: $fa-var-internet-explorer; } -.#{$fa-css-prefix}-tv:before, -.#{$fa-css-prefix}-television:before { content: $fa-var-television; } -.#{$fa-css-prefix}-contao:before { content: $fa-var-contao; } -.#{$fa-css-prefix}-500px:before { content: $fa-var-500px; } -.#{$fa-css-prefix}-amazon:before { content: $fa-var-amazon; } -.#{$fa-css-prefix}-calendar-plus-o:before { content: $fa-var-calendar-plus-o; } -.#{$fa-css-prefix}-calendar-minus-o:before { content: $fa-var-calendar-minus-o; } -.#{$fa-css-prefix}-calendar-times-o:before { content: $fa-var-calendar-times-o; } -.#{$fa-css-prefix}-calendar-check-o:before { content: $fa-var-calendar-check-o; } -.#{$fa-css-prefix}-industry:before { content: $fa-var-industry; } -.#{$fa-css-prefix}-map-pin:before { content: $fa-var-map-pin; } -.#{$fa-css-prefix}-map-signs:before { content: $fa-var-map-signs; } -.#{$fa-css-prefix}-map-o:before { content: $fa-var-map-o; } -.#{$fa-css-prefix}-map:before { content: $fa-var-map; } -.#{$fa-css-prefix}-commenting:before { content: $fa-var-commenting; } -.#{$fa-css-prefix}-commenting-o:before { content: $fa-var-commenting-o; } -.#{$fa-css-prefix}-houzz:before { content: $fa-var-houzz; } -.#{$fa-css-prefix}-vimeo:before { content: $fa-var-vimeo; } -.#{$fa-css-prefix}-black-tie:before { content: $fa-var-black-tie; } -.#{$fa-css-prefix}-fonticons:before { content: $fa-var-fonticons; } -.#{$fa-css-prefix}-reddit-alien:before { content: $fa-var-reddit-alien; } -.#{$fa-css-prefix}-edge:before { content: $fa-var-edge; } -.#{$fa-css-prefix}-credit-card-alt:before { content: $fa-var-credit-card-alt; } -.#{$fa-css-prefix}-codiepie:before { content: $fa-var-codiepie; } -.#{$fa-css-prefix}-modx:before { content: $fa-var-modx; } -.#{$fa-css-prefix}-fort-awesome:before { content: $fa-var-fort-awesome; } -.#{$fa-css-prefix}-usb:before { content: $fa-var-usb; } -.#{$fa-css-prefix}-product-hunt:before { content: $fa-var-product-hunt; } -.#{$fa-css-prefix}-mixcloud:before { content: $fa-var-mixcloud; } -.#{$fa-css-prefix}-scribd:before { content: $fa-var-scribd; } -.#{$fa-css-prefix}-pause-circle:before { content: $fa-var-pause-circle; } -.#{$fa-css-prefix}-pause-circle-o:before { content: $fa-var-pause-circle-o; } -.#{$fa-css-prefix}-stop-circle:before { content: $fa-var-stop-circle; } -.#{$fa-css-prefix}-stop-circle-o:before { content: $fa-var-stop-circle-o; } -.#{$fa-css-prefix}-shopping-bag:before { content: $fa-var-shopping-bag; } -.#{$fa-css-prefix}-shopping-basket:before { content: $fa-var-shopping-basket; } -.#{$fa-css-prefix}-hashtag:before { content: $fa-var-hashtag; } -.#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; } -.#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; } -.#{$fa-css-prefix}-percent:before { content: $fa-var-percent; } -.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; } -.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; } -.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; } -.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; } -.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; } -.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; } -.#{$fa-css-prefix}-question-circle-o:before { content: $fa-var-question-circle-o; } -.#{$fa-css-prefix}-blind:before { content: $fa-var-blind; } -.#{$fa-css-prefix}-audio-description:before { content: $fa-var-audio-description; } -.#{$fa-css-prefix}-volume-control-phone:before { content: $fa-var-volume-control-phone; } -.#{$fa-css-prefix}-braille:before { content: $fa-var-braille; } -.#{$fa-css-prefix}-assistive-listening-systems:before { content: $fa-var-assistive-listening-systems; } -.#{$fa-css-prefix}-asl-interpreting:before, -.#{$fa-css-prefix}-american-sign-language-interpreting:before { content: $fa-var-american-sign-language-interpreting; } -.#{$fa-css-prefix}-deafness:before, -.#{$fa-css-prefix}-hard-of-hearing:before, -.#{$fa-css-prefix}-deaf:before { content: $fa-var-deaf; } -.#{$fa-css-prefix}-glide:before { content: $fa-var-glide; } -.#{$fa-css-prefix}-glide-g:before { content: $fa-var-glide-g; } -.#{$fa-css-prefix}-signing:before, -.#{$fa-css-prefix}-sign-language:before { content: $fa-var-sign-language; } -.#{$fa-css-prefix}-low-vision:before { content: $fa-var-low-vision; } -.#{$fa-css-prefix}-viadeo:before { content: $fa-var-viadeo; } -.#{$fa-css-prefix}-viadeo-square:before { content: $fa-var-viadeo-square; } -.#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; } -.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; } -.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; } -.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; } -.#{$fa-css-prefix}-first-order:before { content: $fa-var-first-order; } -.#{$fa-css-prefix}-yoast:before { content: $fa-var-yoast; } -.#{$fa-css-prefix}-themeisle:before { content: $fa-var-themeisle; } -.#{$fa-css-prefix}-google-plus-circle:before, -.#{$fa-css-prefix}-google-plus-official:before { content: $fa-var-google-plus-official; } -.#{$fa-css-prefix}-fa:before, -.#{$fa-css-prefix}-font-awesome:before { content: $fa-var-font-awesome; } -.#{$fa-css-prefix}-handshake-o:before { content: $fa-var-handshake-o; } -.#{$fa-css-prefix}-envelope-open:before { content: $fa-var-envelope-open; } -.#{$fa-css-prefix}-envelope-open-o:before { content: $fa-var-envelope-open-o; } -.#{$fa-css-prefix}-linode:before { content: $fa-var-linode; } -.#{$fa-css-prefix}-address-book:before { content: $fa-var-address-book; } -.#{$fa-css-prefix}-address-book-o:before { content: $fa-var-address-book-o; } -.#{$fa-css-prefix}-vcard:before, -.#{$fa-css-prefix}-address-card:before { content: $fa-var-address-card; } -.#{$fa-css-prefix}-vcard-o:before, -.#{$fa-css-prefix}-address-card-o:before { content: $fa-var-address-card-o; } -.#{$fa-css-prefix}-user-circle:before { content: $fa-var-user-circle; } -.#{$fa-css-prefix}-user-circle-o:before { content: $fa-var-user-circle-o; } -.#{$fa-css-prefix}-user-o:before { content: $fa-var-user-o; } -.#{$fa-css-prefix}-id-badge:before { content: $fa-var-id-badge; } -.#{$fa-css-prefix}-drivers-license:before, -.#{$fa-css-prefix}-id-card:before { content: $fa-var-id-card; } -.#{$fa-css-prefix}-drivers-license-o:before, -.#{$fa-css-prefix}-id-card-o:before { content: $fa-var-id-card-o; } -.#{$fa-css-prefix}-quora:before { content: $fa-var-quora; } -.#{$fa-css-prefix}-free-code-camp:before { content: $fa-var-free-code-camp; } -.#{$fa-css-prefix}-telegram:before { content: $fa-var-telegram; } -.#{$fa-css-prefix}-thermometer-4:before, -.#{$fa-css-prefix}-thermometer:before, -.#{$fa-css-prefix}-thermometer-full:before { content: $fa-var-thermometer-full; } -.#{$fa-css-prefix}-thermometer-3:before, -.#{$fa-css-prefix}-thermometer-three-quarters:before { content: $fa-var-thermometer-three-quarters; } -.#{$fa-css-prefix}-thermometer-2:before, -.#{$fa-css-prefix}-thermometer-half:before { content: $fa-var-thermometer-half; } -.#{$fa-css-prefix}-thermometer-1:before, -.#{$fa-css-prefix}-thermometer-quarter:before { content: $fa-var-thermometer-quarter; } -.#{$fa-css-prefix}-thermometer-0:before, -.#{$fa-css-prefix}-thermometer-empty:before { content: $fa-var-thermometer-empty; } -.#{$fa-css-prefix}-shower:before { content: $fa-var-shower; } -.#{$fa-css-prefix}-bathtub:before, -.#{$fa-css-prefix}-s15:before, -.#{$fa-css-prefix}-bath:before { content: $fa-var-bath; } -.#{$fa-css-prefix}-podcast:before { content: $fa-var-podcast; } -.#{$fa-css-prefix}-window-maximize:before { content: $fa-var-window-maximize; } -.#{$fa-css-prefix}-window-minimize:before { content: $fa-var-window-minimize; } -.#{$fa-css-prefix}-window-restore:before { content: $fa-var-window-restore; } -.#{$fa-css-prefix}-times-rectangle:before, -.#{$fa-css-prefix}-window-close:before { content: $fa-var-window-close; } -.#{$fa-css-prefix}-times-rectangle-o:before, -.#{$fa-css-prefix}-window-close-o:before { content: $fa-var-window-close-o; } -.#{$fa-css-prefix}-bandcamp:before { content: $fa-var-bandcamp; } -.#{$fa-css-prefix}-grav:before { content: $fa-var-grav; } -.#{$fa-css-prefix}-etsy:before { content: $fa-var-etsy; } -.#{$fa-css-prefix}-imdb:before { content: $fa-var-imdb; } -.#{$fa-css-prefix}-ravelry:before { content: $fa-var-ravelry; } -.#{$fa-css-prefix}-eercast:before { content: $fa-var-eercast; } -.#{$fa-css-prefix}-microchip:before { content: $fa-var-microchip; } -.#{$fa-css-prefix}-snowflake-o:before { content: $fa-var-snowflake-o; } -.#{$fa-css-prefix}-superpowers:before { content: $fa-var-superpowers; } -.#{$fa-css-prefix}-wpexplorer:before { content: $fa-var-wpexplorer; } -.#{$fa-css-prefix}-meetup:before { content: $fa-var-meetup; } diff --git a/assets/css/font-awesome/scss/_larger.scss b/assets/css/font-awesome/scss/_larger.scss deleted file mode 100644 index 41e9a81..0000000 --- a/assets/css/font-awesome/scss/_larger.scss +++ /dev/null @@ -1,13 +0,0 @@ -// Icon Sizes -// ------------------------- - -/* makes the font 33% larger relative to the icon container */ -.#{$fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); - vertical-align: -15%; -} -.#{$fa-css-prefix}-2x { font-size: 2em; } -.#{$fa-css-prefix}-3x { font-size: 3em; } -.#{$fa-css-prefix}-4x { font-size: 4em; } -.#{$fa-css-prefix}-5x { font-size: 5em; } diff --git a/assets/css/font-awesome/scss/_list.scss b/assets/css/font-awesome/scss/_list.scss deleted file mode 100644 index 7d1e4d5..0000000 --- a/assets/css/font-awesome/scss/_list.scss +++ /dev/null @@ -1,19 +0,0 @@ -// List Icons -// ------------------------- - -.#{$fa-css-prefix}-ul { - padding-left: 0; - margin-left: $fa-li-width; - list-style-type: none; - > li { position: relative; } -} -.#{$fa-css-prefix}-li { - position: absolute; - left: -$fa-li-width; - width: $fa-li-width; - top: (2em / 14); - text-align: center; - &.#{$fa-css-prefix}-lg { - left: -$fa-li-width + (4em / 14); - } -} diff --git a/assets/css/font-awesome/scss/_mixins.scss b/assets/css/font-awesome/scss/_mixins.scss deleted file mode 100644 index c3bbd57..0000000 --- a/assets/css/font-awesome/scss/_mixins.scss +++ /dev/null @@ -1,60 +0,0 @@ -// Mixins -// -------------------------- - -@mixin fa-icon() { - display: inline-block; - font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - -} - -@mixin fa-icon-rotate($degrees, $rotation) { - -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})"; - -webkit-transform: rotate($degrees); - -ms-transform: rotate($degrees); - transform: rotate($degrees); -} - -@mixin fa-icon-flip($horiz, $vert, $rotation) { - -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)"; - -webkit-transform: scale($horiz, $vert); - -ms-transform: scale($horiz, $vert); - transform: scale($horiz, $vert); -} - - -// Only display content to screen readers. A la Bootstrap 4. -// -// See: http://a11yproject.com/posts/how-to-hide-content/ - -@mixin sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0,0,0,0); - border: 0; -} - -// Use in conjunction with .sr-only to only display content when it's focused. -// -// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 -// -// Credit: HTML5 Boilerplate - -@mixin sr-only-focusable { - &:active, - &:focus { - position: static; - width: auto; - height: auto; - margin: 0; - overflow: visible; - clip: auto; - } -} diff --git a/assets/css/font-awesome/scss/_path.scss b/assets/css/font-awesome/scss/_path.scss deleted file mode 100644 index bb457c2..0000000 --- a/assets/css/font-awesome/scss/_path.scss +++ /dev/null @@ -1,15 +0,0 @@ -/* FONT PATH - * -------------------------- */ - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); -// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} diff --git a/assets/css/font-awesome/scss/_rotated-flipped.scss b/assets/css/font-awesome/scss/_rotated-flipped.scss deleted file mode 100644 index a3558fd..0000000 --- a/assets/css/font-awesome/scss/_rotated-flipped.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Rotated & Flipped Icons -// ------------------------- - -.#{$fa-css-prefix}-rotate-90 { @include fa-icon-rotate(90deg, 1); } -.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); } -.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); } - -.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } -.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } - -// Hook for IE8-9 -// ------------------------- - -:root .#{$fa-css-prefix}-rotate-90, -:root .#{$fa-css-prefix}-rotate-180, -:root .#{$fa-css-prefix}-rotate-270, -:root .#{$fa-css-prefix}-flip-horizontal, -:root .#{$fa-css-prefix}-flip-vertical { - filter: none; -} diff --git a/assets/css/font-awesome/scss/_screen-reader.scss b/assets/css/font-awesome/scss/_screen-reader.scss deleted file mode 100644 index 637426f..0000000 --- a/assets/css/font-awesome/scss/_screen-reader.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Screen Readers -// ------------------------- - -.sr-only { @include sr-only(); } -.sr-only-focusable { @include sr-only-focusable(); } diff --git a/assets/css/font-awesome/scss/_stacked.scss b/assets/css/font-awesome/scss/_stacked.scss deleted file mode 100644 index aef7403..0000000 --- a/assets/css/font-awesome/scss/_stacked.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Stacked Icons -// ------------------------- - -.#{$fa-css-prefix}-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.#{$fa-css-prefix}-stack-1x { line-height: inherit; } -.#{$fa-css-prefix}-stack-2x { font-size: 2em; } -.#{$fa-css-prefix}-inverse { color: $fa-inverse; } diff --git a/assets/css/font-awesome/scss/_variables.scss b/assets/css/font-awesome/scss/_variables.scss deleted file mode 100644 index 498fc4a..0000000 --- a/assets/css/font-awesome/scss/_variables.scss +++ /dev/null @@ -1,800 +0,0 @@ -// Variables -// -------------------------- - -$fa-font-path: "../fonts" !default; -$fa-font-size-base: 14px !default; -$fa-line-height-base: 1 !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly -$fa-css-prefix: fa !default; -$fa-version: "4.7.0" !default; -$fa-border-color: #eee !default; -$fa-inverse: #fff !default; -$fa-li-width: (30em / 14) !default; - -$fa-var-500px: "\f26e"; -$fa-var-address-book: "\f2b9"; -$fa-var-address-book-o: "\f2ba"; -$fa-var-address-card: "\f2bb"; -$fa-var-address-card-o: "\f2bc"; -$fa-var-adjust: "\f042"; -$fa-var-adn: "\f170"; -$fa-var-align-center: "\f037"; -$fa-var-align-justify: "\f039"; -$fa-var-align-left: "\f036"; -$fa-var-align-right: "\f038"; -$fa-var-amazon: "\f270"; -$fa-var-ambulance: "\f0f9"; -$fa-var-american-sign-language-interpreting: "\f2a3"; -$fa-var-anchor: "\f13d"; -$fa-var-android: "\f17b"; -$fa-var-angellist: "\f209"; -$fa-var-angle-double-down: "\f103"; -$fa-var-angle-double-left: "\f100"; -$fa-var-angle-double-right: "\f101"; -$fa-var-angle-double-up: "\f102"; -$fa-var-angle-down: "\f107"; -$fa-var-angle-left: "\f104"; -$fa-var-angle-right: "\f105"; -$fa-var-angle-up: "\f106"; -$fa-var-apple: "\f179"; -$fa-var-archive: "\f187"; -$fa-var-area-chart: "\f1fe"; -$fa-var-arrow-circle-down: "\f0ab"; -$fa-var-arrow-circle-left: "\f0a8"; -$fa-var-arrow-circle-o-down: "\f01a"; -$fa-var-arrow-circle-o-left: "\f190"; -$fa-var-arrow-circle-o-right: "\f18e"; -$fa-var-arrow-circle-o-up: "\f01b"; -$fa-var-arrow-circle-right: "\f0a9"; -$fa-var-arrow-circle-up: "\f0aa"; -$fa-var-arrow-down: "\f063"; -$fa-var-arrow-left: "\f060"; -$fa-var-arrow-right: "\f061"; -$fa-var-arrow-up: "\f062"; -$fa-var-arrows: "\f047"; -$fa-var-arrows-alt: "\f0b2"; -$fa-var-arrows-h: "\f07e"; -$fa-var-arrows-v: "\f07d"; -$fa-var-asl-interpreting: "\f2a3"; -$fa-var-assistive-listening-systems: "\f2a2"; -$fa-var-asterisk: "\f069"; -$fa-var-at: "\f1fa"; -$fa-var-audio-description: "\f29e"; -$fa-var-automobile: "\f1b9"; -$fa-var-backward: "\f04a"; -$fa-var-balance-scale: "\f24e"; -$fa-var-ban: "\f05e"; -$fa-var-bandcamp: "\f2d5"; -$fa-var-bank: "\f19c"; -$fa-var-bar-chart: "\f080"; -$fa-var-bar-chart-o: "\f080"; -$fa-var-barcode: "\f02a"; -$fa-var-bars: "\f0c9"; -$fa-var-bath: "\f2cd"; -$fa-var-bathtub: "\f2cd"; -$fa-var-battery: "\f240"; -$fa-var-battery-0: "\f244"; -$fa-var-battery-1: "\f243"; -$fa-var-battery-2: "\f242"; -$fa-var-battery-3: "\f241"; -$fa-var-battery-4: "\f240"; -$fa-var-battery-empty: "\f244"; -$fa-var-battery-full: "\f240"; -$fa-var-battery-half: "\f242"; -$fa-var-battery-quarter: "\f243"; -$fa-var-battery-three-quarters: "\f241"; -$fa-var-bed: "\f236"; -$fa-var-beer: "\f0fc"; -$fa-var-behance: "\f1b4"; -$fa-var-behance-square: "\f1b5"; -$fa-var-bell: "\f0f3"; -$fa-var-bell-o: "\f0a2"; -$fa-var-bell-slash: "\f1f6"; -$fa-var-bell-slash-o: "\f1f7"; -$fa-var-bicycle: "\f206"; -$fa-var-binoculars: "\f1e5"; -$fa-var-birthday-cake: "\f1fd"; -$fa-var-bitbucket: "\f171"; -$fa-var-bitbucket-square: "\f172"; -$fa-var-bitcoin: "\f15a"; -$fa-var-black-tie: "\f27e"; -$fa-var-blind: "\f29d"; -$fa-var-bluetooth: "\f293"; -$fa-var-bluetooth-b: "\f294"; -$fa-var-bold: "\f032"; -$fa-var-bolt: "\f0e7"; -$fa-var-bomb: "\f1e2"; -$fa-var-book: "\f02d"; -$fa-var-bookmark: "\f02e"; -$fa-var-bookmark-o: "\f097"; -$fa-var-braille: "\f2a1"; -$fa-var-briefcase: "\f0b1"; -$fa-var-btc: "\f15a"; -$fa-var-bug: "\f188"; -$fa-var-building: "\f1ad"; -$fa-var-building-o: "\f0f7"; -$fa-var-bullhorn: "\f0a1"; -$fa-var-bullseye: "\f140"; -$fa-var-bus: "\f207"; -$fa-var-buysellads: "\f20d"; -$fa-var-cab: "\f1ba"; -$fa-var-calculator: "\f1ec"; -$fa-var-calendar: "\f073"; -$fa-var-calendar-check-o: "\f274"; -$fa-var-calendar-minus-o: "\f272"; -$fa-var-calendar-o: "\f133"; -$fa-var-calendar-plus-o: "\f271"; -$fa-var-calendar-times-o: "\f273"; -$fa-var-camera: "\f030"; -$fa-var-camera-retro: "\f083"; -$fa-var-car: "\f1b9"; -$fa-var-caret-down: "\f0d7"; -$fa-var-caret-left: "\f0d9"; -$fa-var-caret-right: "\f0da"; -$fa-var-caret-square-o-down: "\f150"; -$fa-var-caret-square-o-left: "\f191"; -$fa-var-caret-square-o-right: "\f152"; -$fa-var-caret-square-o-up: "\f151"; -$fa-var-caret-up: "\f0d8"; -$fa-var-cart-arrow-down: "\f218"; -$fa-var-cart-plus: "\f217"; -$fa-var-cc: "\f20a"; -$fa-var-cc-amex: "\f1f3"; -$fa-var-cc-diners-club: "\f24c"; -$fa-var-cc-discover: "\f1f2"; -$fa-var-cc-jcb: "\f24b"; -$fa-var-cc-mastercard: "\f1f1"; -$fa-var-cc-paypal: "\f1f4"; -$fa-var-cc-stripe: "\f1f5"; -$fa-var-cc-visa: "\f1f0"; -$fa-var-certificate: "\f0a3"; -$fa-var-chain: "\f0c1"; -$fa-var-chain-broken: "\f127"; -$fa-var-check: "\f00c"; -$fa-var-check-circle: "\f058"; -$fa-var-check-circle-o: "\f05d"; -$fa-var-check-square: "\f14a"; -$fa-var-check-square-o: "\f046"; -$fa-var-chevron-circle-down: "\f13a"; -$fa-var-chevron-circle-left: "\f137"; -$fa-var-chevron-circle-right: "\f138"; -$fa-var-chevron-circle-up: "\f139"; -$fa-var-chevron-down: "\f078"; -$fa-var-chevron-left: "\f053"; -$fa-var-chevron-right: "\f054"; -$fa-var-chevron-up: "\f077"; -$fa-var-child: "\f1ae"; -$fa-var-chrome: "\f268"; -$fa-var-circle: "\f111"; -$fa-var-circle-o: "\f10c"; -$fa-var-circle-o-notch: "\f1ce"; -$fa-var-circle-thin: "\f1db"; -$fa-var-clipboard: "\f0ea"; -$fa-var-clock-o: "\f017"; -$fa-var-clone: "\f24d"; -$fa-var-close: "\f00d"; -$fa-var-cloud: "\f0c2"; -$fa-var-cloud-download: "\f0ed"; -$fa-var-cloud-upload: "\f0ee"; -$fa-var-cny: "\f157"; -$fa-var-code: "\f121"; -$fa-var-code-fork: "\f126"; -$fa-var-codepen: "\f1cb"; -$fa-var-codiepie: "\f284"; -$fa-var-coffee: "\f0f4"; -$fa-var-cog: "\f013"; -$fa-var-cogs: "\f085"; -$fa-var-columns: "\f0db"; -$fa-var-comment: "\f075"; -$fa-var-comment-o: "\f0e5"; -$fa-var-commenting: "\f27a"; -$fa-var-commenting-o: "\f27b"; -$fa-var-comments: "\f086"; -$fa-var-comments-o: "\f0e6"; -$fa-var-compass: "\f14e"; -$fa-var-compress: "\f066"; -$fa-var-connectdevelop: "\f20e"; -$fa-var-contao: "\f26d"; -$fa-var-copy: "\f0c5"; -$fa-var-copyright: "\f1f9"; -$fa-var-creative-commons: "\f25e"; -$fa-var-credit-card: "\f09d"; -$fa-var-credit-card-alt: "\f283"; -$fa-var-crop: "\f125"; -$fa-var-crosshairs: "\f05b"; -$fa-var-css3: "\f13c"; -$fa-var-cube: "\f1b2"; -$fa-var-cubes: "\f1b3"; -$fa-var-cut: "\f0c4"; -$fa-var-cutlery: "\f0f5"; -$fa-var-dashboard: "\f0e4"; -$fa-var-dashcube: "\f210"; -$fa-var-database: "\f1c0"; -$fa-var-deaf: "\f2a4"; -$fa-var-deafness: "\f2a4"; -$fa-var-dedent: "\f03b"; -$fa-var-delicious: "\f1a5"; -$fa-var-desktop: "\f108"; -$fa-var-deviantart: "\f1bd"; -$fa-var-diamond: "\f219"; -$fa-var-digg: "\f1a6"; -$fa-var-dollar: "\f155"; -$fa-var-dot-circle-o: "\f192"; -$fa-var-download: "\f019"; -$fa-var-dribbble: "\f17d"; -$fa-var-drivers-license: "\f2c2"; -$fa-var-drivers-license-o: "\f2c3"; -$fa-var-dropbox: "\f16b"; -$fa-var-drupal: "\f1a9"; -$fa-var-edge: "\f282"; -$fa-var-edit: "\f044"; -$fa-var-eercast: "\f2da"; -$fa-var-eject: "\f052"; -$fa-var-ellipsis-h: "\f141"; -$fa-var-ellipsis-v: "\f142"; -$fa-var-empire: "\f1d1"; -$fa-var-envelope: "\f0e0"; -$fa-var-envelope-o: "\f003"; -$fa-var-envelope-open: "\f2b6"; -$fa-var-envelope-open-o: "\f2b7"; -$fa-var-envelope-square: "\f199"; -$fa-var-envira: "\f299"; -$fa-var-eraser: "\f12d"; -$fa-var-etsy: "\f2d7"; -$fa-var-eur: "\f153"; -$fa-var-euro: "\f153"; -$fa-var-exchange: "\f0ec"; -$fa-var-exclamation: "\f12a"; -$fa-var-exclamation-circle: "\f06a"; -$fa-var-exclamation-triangle: "\f071"; -$fa-var-expand: "\f065"; -$fa-var-expeditedssl: "\f23e"; -$fa-var-external-link: "\f08e"; -$fa-var-external-link-square: "\f14c"; -$fa-var-eye: "\f06e"; -$fa-var-eye-slash: "\f070"; -$fa-var-eyedropper: "\f1fb"; -$fa-var-fa: "\f2b4"; -$fa-var-facebook: "\f09a"; -$fa-var-facebook-f: "\f09a"; -$fa-var-facebook-official: "\f230"; -$fa-var-facebook-square: "\f082"; -$fa-var-fast-backward: "\f049"; -$fa-var-fast-forward: "\f050"; -$fa-var-fax: "\f1ac"; -$fa-var-feed: "\f09e"; -$fa-var-female: "\f182"; -$fa-var-fighter-jet: "\f0fb"; -$fa-var-file: "\f15b"; -$fa-var-file-archive-o: "\f1c6"; -$fa-var-file-audio-o: "\f1c7"; -$fa-var-file-code-o: "\f1c9"; -$fa-var-file-excel-o: "\f1c3"; -$fa-var-file-image-o: "\f1c5"; -$fa-var-file-movie-o: "\f1c8"; -$fa-var-file-o: "\f016"; -$fa-var-file-pdf-o: "\f1c1"; -$fa-var-file-photo-o: "\f1c5"; -$fa-var-file-picture-o: "\f1c5"; -$fa-var-file-powerpoint-o: "\f1c4"; -$fa-var-file-sound-o: "\f1c7"; -$fa-var-file-text: "\f15c"; -$fa-var-file-text-o: "\f0f6"; -$fa-var-file-video-o: "\f1c8"; -$fa-var-file-word-o: "\f1c2"; -$fa-var-file-zip-o: "\f1c6"; -$fa-var-files-o: "\f0c5"; -$fa-var-film: "\f008"; -$fa-var-filter: "\f0b0"; -$fa-var-fire: "\f06d"; -$fa-var-fire-extinguisher: "\f134"; -$fa-var-firefox: "\f269"; -$fa-var-first-order: "\f2b0"; -$fa-var-flag: "\f024"; -$fa-var-flag-checkered: "\f11e"; -$fa-var-flag-o: "\f11d"; -$fa-var-flash: "\f0e7"; -$fa-var-flask: "\f0c3"; -$fa-var-flickr: "\f16e"; -$fa-var-floppy-o: "\f0c7"; -$fa-var-folder: "\f07b"; -$fa-var-folder-o: "\f114"; -$fa-var-folder-open: "\f07c"; -$fa-var-folder-open-o: "\f115"; -$fa-var-font: "\f031"; -$fa-var-font-awesome: "\f2b4"; -$fa-var-fonticons: "\f280"; -$fa-var-fort-awesome: "\f286"; -$fa-var-forumbee: "\f211"; -$fa-var-forward: "\f04e"; -$fa-var-foursquare: "\f180"; -$fa-var-free-code-camp: "\f2c5"; -$fa-var-frown-o: "\f119"; -$fa-var-futbol-o: "\f1e3"; -$fa-var-gamepad: "\f11b"; -$fa-var-gavel: "\f0e3"; -$fa-var-gbp: "\f154"; -$fa-var-ge: "\f1d1"; -$fa-var-gear: "\f013"; -$fa-var-gears: "\f085"; -$fa-var-genderless: "\f22d"; -$fa-var-get-pocket: "\f265"; -$fa-var-gg: "\f260"; -$fa-var-gg-circle: "\f261"; -$fa-var-gift: "\f06b"; -$fa-var-git: "\f1d3"; -$fa-var-git-square: "\f1d2"; -$fa-var-github: "\f09b"; -$fa-var-github-alt: "\f113"; -$fa-var-github-square: "\f092"; -$fa-var-gitlab: "\f296"; -$fa-var-gittip: "\f184"; -$fa-var-glass: "\f000"; -$fa-var-glide: "\f2a5"; -$fa-var-glide-g: "\f2a6"; -$fa-var-globe: "\f0ac"; -$fa-var-google: "\f1a0"; -$fa-var-google-plus: "\f0d5"; -$fa-var-google-plus-circle: "\f2b3"; -$fa-var-google-plus-official: "\f2b3"; -$fa-var-google-plus-square: "\f0d4"; -$fa-var-google-wallet: "\f1ee"; -$fa-var-graduation-cap: "\f19d"; -$fa-var-gratipay: "\f184"; -$fa-var-grav: "\f2d6"; -$fa-var-group: "\f0c0"; -$fa-var-h-square: "\f0fd"; -$fa-var-hacker-news: "\f1d4"; -$fa-var-hand-grab-o: "\f255"; -$fa-var-hand-lizard-o: "\f258"; -$fa-var-hand-o-down: "\f0a7"; -$fa-var-hand-o-left: "\f0a5"; -$fa-var-hand-o-right: "\f0a4"; -$fa-var-hand-o-up: "\f0a6"; -$fa-var-hand-paper-o: "\f256"; -$fa-var-hand-peace-o: "\f25b"; -$fa-var-hand-pointer-o: "\f25a"; -$fa-var-hand-rock-o: "\f255"; -$fa-var-hand-scissors-o: "\f257"; -$fa-var-hand-spock-o: "\f259"; -$fa-var-hand-stop-o: "\f256"; -$fa-var-handshake-o: "\f2b5"; -$fa-var-hard-of-hearing: "\f2a4"; -$fa-var-hashtag: "\f292"; -$fa-var-hdd-o: "\f0a0"; -$fa-var-header: "\f1dc"; -$fa-var-headphones: "\f025"; -$fa-var-heart: "\f004"; -$fa-var-heart-o: "\f08a"; -$fa-var-heartbeat: "\f21e"; -$fa-var-history: "\f1da"; -$fa-var-home: "\f015"; -$fa-var-hospital-o: "\f0f8"; -$fa-var-hotel: "\f236"; -$fa-var-hourglass: "\f254"; -$fa-var-hourglass-1: "\f251"; -$fa-var-hourglass-2: "\f252"; -$fa-var-hourglass-3: "\f253"; -$fa-var-hourglass-end: "\f253"; -$fa-var-hourglass-half: "\f252"; -$fa-var-hourglass-o: "\f250"; -$fa-var-hourglass-start: "\f251"; -$fa-var-houzz: "\f27c"; -$fa-var-html5: "\f13b"; -$fa-var-i-cursor: "\f246"; -$fa-var-id-badge: "\f2c1"; -$fa-var-id-card: "\f2c2"; -$fa-var-id-card-o: "\f2c3"; -$fa-var-ils: "\f20b"; -$fa-var-image: "\f03e"; -$fa-var-imdb: "\f2d8"; -$fa-var-inbox: "\f01c"; -$fa-var-indent: "\f03c"; -$fa-var-industry: "\f275"; -$fa-var-info: "\f129"; -$fa-var-info-circle: "\f05a"; -$fa-var-inr: "\f156"; -$fa-var-instagram: "\f16d"; -$fa-var-institution: "\f19c"; -$fa-var-internet-explorer: "\f26b"; -$fa-var-intersex: "\f224"; -$fa-var-ioxhost: "\f208"; -$fa-var-italic: "\f033"; -$fa-var-joomla: "\f1aa"; -$fa-var-jpy: "\f157"; -$fa-var-jsfiddle: "\f1cc"; -$fa-var-key: "\f084"; -$fa-var-keyboard-o: "\f11c"; -$fa-var-krw: "\f159"; -$fa-var-language: "\f1ab"; -$fa-var-laptop: "\f109"; -$fa-var-lastfm: "\f202"; -$fa-var-lastfm-square: "\f203"; -$fa-var-leaf: "\f06c"; -$fa-var-leanpub: "\f212"; -$fa-var-legal: "\f0e3"; -$fa-var-lemon-o: "\f094"; -$fa-var-level-down: "\f149"; -$fa-var-level-up: "\f148"; -$fa-var-life-bouy: "\f1cd"; -$fa-var-life-buoy: "\f1cd"; -$fa-var-life-ring: "\f1cd"; -$fa-var-life-saver: "\f1cd"; -$fa-var-lightbulb-o: "\f0eb"; -$fa-var-line-chart: "\f201"; -$fa-var-link: "\f0c1"; -$fa-var-linkedin: "\f0e1"; -$fa-var-linkedin-square: "\f08c"; -$fa-var-linode: "\f2b8"; -$fa-var-linux: "\f17c"; -$fa-var-list: "\f03a"; -$fa-var-list-alt: "\f022"; -$fa-var-list-ol: "\f0cb"; -$fa-var-list-ul: "\f0ca"; -$fa-var-location-arrow: "\f124"; -$fa-var-lock: "\f023"; -$fa-var-long-arrow-down: "\f175"; -$fa-var-long-arrow-left: "\f177"; -$fa-var-long-arrow-right: "\f178"; -$fa-var-long-arrow-up: "\f176"; -$fa-var-low-vision: "\f2a8"; -$fa-var-magic: "\f0d0"; -$fa-var-magnet: "\f076"; -$fa-var-mail-forward: "\f064"; -$fa-var-mail-reply: "\f112"; -$fa-var-mail-reply-all: "\f122"; -$fa-var-male: "\f183"; -$fa-var-map: "\f279"; -$fa-var-map-marker: "\f041"; -$fa-var-map-o: "\f278"; -$fa-var-map-pin: "\f276"; -$fa-var-map-signs: "\f277"; -$fa-var-mars: "\f222"; -$fa-var-mars-double: "\f227"; -$fa-var-mars-stroke: "\f229"; -$fa-var-mars-stroke-h: "\f22b"; -$fa-var-mars-stroke-v: "\f22a"; -$fa-var-maxcdn: "\f136"; -$fa-var-meanpath: "\f20c"; -$fa-var-medium: "\f23a"; -$fa-var-medkit: "\f0fa"; -$fa-var-meetup: "\f2e0"; -$fa-var-meh-o: "\f11a"; -$fa-var-mercury: "\f223"; -$fa-var-microchip: "\f2db"; -$fa-var-microphone: "\f130"; -$fa-var-microphone-slash: "\f131"; -$fa-var-minus: "\f068"; -$fa-var-minus-circle: "\f056"; -$fa-var-minus-square: "\f146"; -$fa-var-minus-square-o: "\f147"; -$fa-var-mixcloud: "\f289"; -$fa-var-mobile: "\f10b"; -$fa-var-mobile-phone: "\f10b"; -$fa-var-modx: "\f285"; -$fa-var-money: "\f0d6"; -$fa-var-moon-o: "\f186"; -$fa-var-mortar-board: "\f19d"; -$fa-var-motorcycle: "\f21c"; -$fa-var-mouse-pointer: "\f245"; -$fa-var-music: "\f001"; -$fa-var-navicon: "\f0c9"; -$fa-var-neuter: "\f22c"; -$fa-var-newspaper-o: "\f1ea"; -$fa-var-object-group: "\f247"; -$fa-var-object-ungroup: "\f248"; -$fa-var-odnoklassniki: "\f263"; -$fa-var-odnoklassniki-square: "\f264"; -$fa-var-opencart: "\f23d"; -$fa-var-openid: "\f19b"; -$fa-var-opera: "\f26a"; -$fa-var-optin-monster: "\f23c"; -$fa-var-outdent: "\f03b"; -$fa-var-pagelines: "\f18c"; -$fa-var-paint-brush: "\f1fc"; -$fa-var-paper-plane: "\f1d8"; -$fa-var-paper-plane-o: "\f1d9"; -$fa-var-paperclip: "\f0c6"; -$fa-var-paragraph: "\f1dd"; -$fa-var-paste: "\f0ea"; -$fa-var-pause: "\f04c"; -$fa-var-pause-circle: "\f28b"; -$fa-var-pause-circle-o: "\f28c"; -$fa-var-paw: "\f1b0"; -$fa-var-paypal: "\f1ed"; -$fa-var-pencil: "\f040"; -$fa-var-pencil-square: "\f14b"; -$fa-var-pencil-square-o: "\f044"; -$fa-var-percent: "\f295"; -$fa-var-phone: "\f095"; -$fa-var-phone-square: "\f098"; -$fa-var-photo: "\f03e"; -$fa-var-picture-o: "\f03e"; -$fa-var-pie-chart: "\f200"; -$fa-var-pied-piper: "\f2ae"; -$fa-var-pied-piper-alt: "\f1a8"; -$fa-var-pied-piper-pp: "\f1a7"; -$fa-var-pinterest: "\f0d2"; -$fa-var-pinterest-p: "\f231"; -$fa-var-pinterest-square: "\f0d3"; -$fa-var-plane: "\f072"; -$fa-var-play: "\f04b"; -$fa-var-play-circle: "\f144"; -$fa-var-play-circle-o: "\f01d"; -$fa-var-plug: "\f1e6"; -$fa-var-plus: "\f067"; -$fa-var-plus-circle: "\f055"; -$fa-var-plus-square: "\f0fe"; -$fa-var-plus-square-o: "\f196"; -$fa-var-podcast: "\f2ce"; -$fa-var-power-off: "\f011"; -$fa-var-print: "\f02f"; -$fa-var-product-hunt: "\f288"; -$fa-var-puzzle-piece: "\f12e"; -$fa-var-qq: "\f1d6"; -$fa-var-qrcode: "\f029"; -$fa-var-question: "\f128"; -$fa-var-question-circle: "\f059"; -$fa-var-question-circle-o: "\f29c"; -$fa-var-quora: "\f2c4"; -$fa-var-quote-left: "\f10d"; -$fa-var-quote-right: "\f10e"; -$fa-var-ra: "\f1d0"; -$fa-var-random: "\f074"; -$fa-var-ravelry: "\f2d9"; -$fa-var-rebel: "\f1d0"; -$fa-var-recycle: "\f1b8"; -$fa-var-reddit: "\f1a1"; -$fa-var-reddit-alien: "\f281"; -$fa-var-reddit-square: "\f1a2"; -$fa-var-refresh: "\f021"; -$fa-var-registered: "\f25d"; -$fa-var-remove: "\f00d"; -$fa-var-renren: "\f18b"; -$fa-var-reorder: "\f0c9"; -$fa-var-repeat: "\f01e"; -$fa-var-reply: "\f112"; -$fa-var-reply-all: "\f122"; -$fa-var-resistance: "\f1d0"; -$fa-var-retweet: "\f079"; -$fa-var-rmb: "\f157"; -$fa-var-road: "\f018"; -$fa-var-rocket: "\f135"; -$fa-var-rotate-left: "\f0e2"; -$fa-var-rotate-right: "\f01e"; -$fa-var-rouble: "\f158"; -$fa-var-rss: "\f09e"; -$fa-var-rss-square: "\f143"; -$fa-var-rub: "\f158"; -$fa-var-ruble: "\f158"; -$fa-var-rupee: "\f156"; -$fa-var-s15: "\f2cd"; -$fa-var-safari: "\f267"; -$fa-var-save: "\f0c7"; -$fa-var-scissors: "\f0c4"; -$fa-var-scribd: "\f28a"; -$fa-var-search: "\f002"; -$fa-var-search-minus: "\f010"; -$fa-var-search-plus: "\f00e"; -$fa-var-sellsy: "\f213"; -$fa-var-send: "\f1d8"; -$fa-var-send-o: "\f1d9"; -$fa-var-server: "\f233"; -$fa-var-share: "\f064"; -$fa-var-share-alt: "\f1e0"; -$fa-var-share-alt-square: "\f1e1"; -$fa-var-share-square: "\f14d"; -$fa-var-share-square-o: "\f045"; -$fa-var-shekel: "\f20b"; -$fa-var-sheqel: "\f20b"; -$fa-var-shield: "\f132"; -$fa-var-ship: "\f21a"; -$fa-var-shirtsinbulk: "\f214"; -$fa-var-shopping-bag: "\f290"; -$fa-var-shopping-basket: "\f291"; -$fa-var-shopping-cart: "\f07a"; -$fa-var-shower: "\f2cc"; -$fa-var-sign-in: "\f090"; -$fa-var-sign-language: "\f2a7"; -$fa-var-sign-out: "\f08b"; -$fa-var-signal: "\f012"; -$fa-var-signing: "\f2a7"; -$fa-var-simplybuilt: "\f215"; -$fa-var-sitemap: "\f0e8"; -$fa-var-skyatlas: "\f216"; -$fa-var-skype: "\f17e"; -$fa-var-slack: "\f198"; -$fa-var-sliders: "\f1de"; -$fa-var-slideshare: "\f1e7"; -$fa-var-smile-o: "\f118"; -$fa-var-snapchat: "\f2ab"; -$fa-var-snapchat-ghost: "\f2ac"; -$fa-var-snapchat-square: "\f2ad"; -$fa-var-snowflake-o: "\f2dc"; -$fa-var-soccer-ball-o: "\f1e3"; -$fa-var-sort: "\f0dc"; -$fa-var-sort-alpha-asc: "\f15d"; -$fa-var-sort-alpha-desc: "\f15e"; -$fa-var-sort-amount-asc: "\f160"; -$fa-var-sort-amount-desc: "\f161"; -$fa-var-sort-asc: "\f0de"; -$fa-var-sort-desc: "\f0dd"; -$fa-var-sort-down: "\f0dd"; -$fa-var-sort-numeric-asc: "\f162"; -$fa-var-sort-numeric-desc: "\f163"; -$fa-var-sort-up: "\f0de"; -$fa-var-soundcloud: "\f1be"; -$fa-var-space-shuttle: "\f197"; -$fa-var-spinner: "\f110"; -$fa-var-spoon: "\f1b1"; -$fa-var-spotify: "\f1bc"; -$fa-var-square: "\f0c8"; -$fa-var-square-o: "\f096"; -$fa-var-stack-exchange: "\f18d"; -$fa-var-stack-overflow: "\f16c"; -$fa-var-star: "\f005"; -$fa-var-star-half: "\f089"; -$fa-var-star-half-empty: "\f123"; -$fa-var-star-half-full: "\f123"; -$fa-var-star-half-o: "\f123"; -$fa-var-star-o: "\f006"; -$fa-var-steam: "\f1b6"; -$fa-var-steam-square: "\f1b7"; -$fa-var-step-backward: "\f048"; -$fa-var-step-forward: "\f051"; -$fa-var-stethoscope: "\f0f1"; -$fa-var-sticky-note: "\f249"; -$fa-var-sticky-note-o: "\f24a"; -$fa-var-stop: "\f04d"; -$fa-var-stop-circle: "\f28d"; -$fa-var-stop-circle-o: "\f28e"; -$fa-var-street-view: "\f21d"; -$fa-var-strikethrough: "\f0cc"; -$fa-var-stumbleupon: "\f1a4"; -$fa-var-stumbleupon-circle: "\f1a3"; -$fa-var-subscript: "\f12c"; -$fa-var-subway: "\f239"; -$fa-var-suitcase: "\f0f2"; -$fa-var-sun-o: "\f185"; -$fa-var-superpowers: "\f2dd"; -$fa-var-superscript: "\f12b"; -$fa-var-support: "\f1cd"; -$fa-var-table: "\f0ce"; -$fa-var-tablet: "\f10a"; -$fa-var-tachometer: "\f0e4"; -$fa-var-tag: "\f02b"; -$fa-var-tags: "\f02c"; -$fa-var-tasks: "\f0ae"; -$fa-var-taxi: "\f1ba"; -$fa-var-telegram: "\f2c6"; -$fa-var-television: "\f26c"; -$fa-var-tencent-weibo: "\f1d5"; -$fa-var-terminal: "\f120"; -$fa-var-text-height: "\f034"; -$fa-var-text-width: "\f035"; -$fa-var-th: "\f00a"; -$fa-var-th-large: "\f009"; -$fa-var-th-list: "\f00b"; -$fa-var-themeisle: "\f2b2"; -$fa-var-thermometer: "\f2c7"; -$fa-var-thermometer-0: "\f2cb"; -$fa-var-thermometer-1: "\f2ca"; -$fa-var-thermometer-2: "\f2c9"; -$fa-var-thermometer-3: "\f2c8"; -$fa-var-thermometer-4: "\f2c7"; -$fa-var-thermometer-empty: "\f2cb"; -$fa-var-thermometer-full: "\f2c7"; -$fa-var-thermometer-half: "\f2c9"; -$fa-var-thermometer-quarter: "\f2ca"; -$fa-var-thermometer-three-quarters: "\f2c8"; -$fa-var-thumb-tack: "\f08d"; -$fa-var-thumbs-down: "\f165"; -$fa-var-thumbs-o-down: "\f088"; -$fa-var-thumbs-o-up: "\f087"; -$fa-var-thumbs-up: "\f164"; -$fa-var-ticket: "\f145"; -$fa-var-times: "\f00d"; -$fa-var-times-circle: "\f057"; -$fa-var-times-circle-o: "\f05c"; -$fa-var-times-rectangle: "\f2d3"; -$fa-var-times-rectangle-o: "\f2d4"; -$fa-var-tint: "\f043"; -$fa-var-toggle-down: "\f150"; -$fa-var-toggle-left: "\f191"; -$fa-var-toggle-off: "\f204"; -$fa-var-toggle-on: "\f205"; -$fa-var-toggle-right: "\f152"; -$fa-var-toggle-up: "\f151"; -$fa-var-trademark: "\f25c"; -$fa-var-train: "\f238"; -$fa-var-transgender: "\f224"; -$fa-var-transgender-alt: "\f225"; -$fa-var-trash: "\f1f8"; -$fa-var-trash-o: "\f014"; -$fa-var-tree: "\f1bb"; -$fa-var-trello: "\f181"; -$fa-var-tripadvisor: "\f262"; -$fa-var-trophy: "\f091"; -$fa-var-truck: "\f0d1"; -$fa-var-try: "\f195"; -$fa-var-tty: "\f1e4"; -$fa-var-tumblr: "\f173"; -$fa-var-tumblr-square: "\f174"; -$fa-var-turkish-lira: "\f195"; -$fa-var-tv: "\f26c"; -$fa-var-twitch: "\f1e8"; -$fa-var-twitter: "\f099"; -$fa-var-twitter-square: "\f081"; -$fa-var-umbrella: "\f0e9"; -$fa-var-underline: "\f0cd"; -$fa-var-undo: "\f0e2"; -$fa-var-universal-access: "\f29a"; -$fa-var-university: "\f19c"; -$fa-var-unlink: "\f127"; -$fa-var-unlock: "\f09c"; -$fa-var-unlock-alt: "\f13e"; -$fa-var-unsorted: "\f0dc"; -$fa-var-upload: "\f093"; -$fa-var-usb: "\f287"; -$fa-var-usd: "\f155"; -$fa-var-user: "\f007"; -$fa-var-user-circle: "\f2bd"; -$fa-var-user-circle-o: "\f2be"; -$fa-var-user-md: "\f0f0"; -$fa-var-user-o: "\f2c0"; -$fa-var-user-plus: "\f234"; -$fa-var-user-secret: "\f21b"; -$fa-var-user-times: "\f235"; -$fa-var-users: "\f0c0"; -$fa-var-vcard: "\f2bb"; -$fa-var-vcard-o: "\f2bc"; -$fa-var-venus: "\f221"; -$fa-var-venus-double: "\f226"; -$fa-var-venus-mars: "\f228"; -$fa-var-viacoin: "\f237"; -$fa-var-viadeo: "\f2a9"; -$fa-var-viadeo-square: "\f2aa"; -$fa-var-video-camera: "\f03d"; -$fa-var-vimeo: "\f27d"; -$fa-var-vimeo-square: "\f194"; -$fa-var-vine: "\f1ca"; -$fa-var-vk: "\f189"; -$fa-var-volume-control-phone: "\f2a0"; -$fa-var-volume-down: "\f027"; -$fa-var-volume-off: "\f026"; -$fa-var-volume-up: "\f028"; -$fa-var-warning: "\f071"; -$fa-var-wechat: "\f1d7"; -$fa-var-weibo: "\f18a"; -$fa-var-weixin: "\f1d7"; -$fa-var-whatsapp: "\f232"; -$fa-var-wheelchair: "\f193"; -$fa-var-wheelchair-alt: "\f29b"; -$fa-var-wifi: "\f1eb"; -$fa-var-wikipedia-w: "\f266"; -$fa-var-window-close: "\f2d3"; -$fa-var-window-close-o: "\f2d4"; -$fa-var-window-maximize: "\f2d0"; -$fa-var-window-minimize: "\f2d1"; -$fa-var-window-restore: "\f2d2"; -$fa-var-windows: "\f17a"; -$fa-var-won: "\f159"; -$fa-var-wordpress: "\f19a"; -$fa-var-wpbeginner: "\f297"; -$fa-var-wpexplorer: "\f2de"; -$fa-var-wpforms: "\f298"; -$fa-var-wrench: "\f0ad"; -$fa-var-xing: "\f168"; -$fa-var-xing-square: "\f169"; -$fa-var-y-combinator: "\f23b"; -$fa-var-y-combinator-square: "\f1d4"; -$fa-var-yahoo: "\f19e"; -$fa-var-yc: "\f23b"; -$fa-var-yc-square: "\f1d4"; -$fa-var-yelp: "\f1e9"; -$fa-var-yen: "\f157"; -$fa-var-yoast: "\f2b1"; -$fa-var-youtube: "\f167"; -$fa-var-youtube-play: "\f16a"; -$fa-var-youtube-square: "\f166"; - diff --git a/about.html b/src/about.html similarity index 100% rename from about.html rename to src/about.html diff --git a/about_us.html b/src/about_us.html similarity index 100% rename from about_us.html rename to src/about_us.html diff --git a/assets/css/about_us.css b/src/assets/css/about_us.css similarity index 100% rename from assets/css/about_us.css rename to src/assets/css/about_us.css diff --git a/assets/css/common.css b/src/assets/css/common.css similarity index 100% rename from assets/css/common.css rename to src/assets/css/common.css diff --git a/assets/css/font-awesome/css/font-awesome.css b/src/assets/css/font-awesome/css/font-awesome.css similarity index 100% rename from assets/css/font-awesome/css/font-awesome.css rename to src/assets/css/font-awesome/css/font-awesome.css diff --git a/assets/css/font-awesome/css/font-awesome.min.css b/src/assets/css/font-awesome/css/font-awesome.min.css similarity index 100% rename from assets/css/font-awesome/css/font-awesome.min.css rename to src/assets/css/font-awesome/css/font-awesome.min.css diff --git a/assets/css/font-awesome/fonts/FontAwesome.otf b/src/assets/css/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from assets/css/font-awesome/fonts/FontAwesome.otf rename to src/assets/css/font-awesome/fonts/FontAwesome.otf diff --git a/assets/css/font-awesome/fonts/fontawesome-webfont.eot b/src/assets/css/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from assets/css/font-awesome/fonts/fontawesome-webfont.eot rename to src/assets/css/font-awesome/fonts/fontawesome-webfont.eot diff --git a/assets/css/font-awesome/fonts/fontawesome-webfont.svg b/src/assets/css/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from assets/css/font-awesome/fonts/fontawesome-webfont.svg rename to src/assets/css/font-awesome/fonts/fontawesome-webfont.svg diff --git a/assets/css/font-awesome/fonts/fontawesome-webfont.ttf b/src/assets/css/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from assets/css/font-awesome/fonts/fontawesome-webfont.ttf rename to src/assets/css/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/assets/css/font-awesome/fonts/fontawesome-webfont.woff b/src/assets/css/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from assets/css/font-awesome/fonts/fontawesome-webfont.woff rename to src/assets/css/font-awesome/fonts/fontawesome-webfont.woff diff --git a/assets/css/font-awesome/fonts/fontawesome-webfont.woff2 b/src/assets/css/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from assets/css/font-awesome/fonts/fontawesome-webfont.woff2 rename to src/assets/css/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/assets/css/font-awesome/less/animated.less b/src/assets/css/font-awesome/less/animated.less similarity index 100% rename from assets/css/font-awesome/less/animated.less rename to src/assets/css/font-awesome/less/animated.less diff --git a/assets/css/font-awesome/less/bordered-pulled.less b/src/assets/css/font-awesome/less/bordered-pulled.less similarity index 100% rename from assets/css/font-awesome/less/bordered-pulled.less rename to src/assets/css/font-awesome/less/bordered-pulled.less diff --git a/assets/css/font-awesome/less/core.less b/src/assets/css/font-awesome/less/core.less similarity index 100% rename from assets/css/font-awesome/less/core.less rename to src/assets/css/font-awesome/less/core.less diff --git a/assets/css/font-awesome/less/fixed-width.less b/src/assets/css/font-awesome/less/fixed-width.less similarity index 100% rename from assets/css/font-awesome/less/fixed-width.less rename to src/assets/css/font-awesome/less/fixed-width.less diff --git a/assets/css/font-awesome/less/font-awesome.less b/src/assets/css/font-awesome/less/font-awesome.less similarity index 100% rename from assets/css/font-awesome/less/font-awesome.less rename to src/assets/css/font-awesome/less/font-awesome.less diff --git a/assets/css/font-awesome/less/icons.less b/src/assets/css/font-awesome/less/icons.less similarity index 100% rename from assets/css/font-awesome/less/icons.less rename to src/assets/css/font-awesome/less/icons.less diff --git a/assets/css/font-awesome/less/larger.less b/src/assets/css/font-awesome/less/larger.less similarity index 100% rename from assets/css/font-awesome/less/larger.less rename to src/assets/css/font-awesome/less/larger.less diff --git a/assets/css/font-awesome/less/list.less b/src/assets/css/font-awesome/less/list.less similarity index 100% rename from assets/css/font-awesome/less/list.less rename to src/assets/css/font-awesome/less/list.less diff --git a/assets/css/font-awesome/less/mixins.less b/src/assets/css/font-awesome/less/mixins.less similarity index 100% rename from assets/css/font-awesome/less/mixins.less rename to src/assets/css/font-awesome/less/mixins.less diff --git a/assets/css/font-awesome/less/path.less b/src/assets/css/font-awesome/less/path.less similarity index 100% rename from assets/css/font-awesome/less/path.less rename to src/assets/css/font-awesome/less/path.less diff --git a/assets/css/font-awesome/less/rotated-flipped.less b/src/assets/css/font-awesome/less/rotated-flipped.less similarity index 100% rename from assets/css/font-awesome/less/rotated-flipped.less rename to src/assets/css/font-awesome/less/rotated-flipped.less diff --git a/assets/css/font-awesome/less/screen-reader.less b/src/assets/css/font-awesome/less/screen-reader.less similarity index 100% rename from assets/css/font-awesome/less/screen-reader.less rename to src/assets/css/font-awesome/less/screen-reader.less diff --git a/assets/css/font-awesome/less/stacked.less b/src/assets/css/font-awesome/less/stacked.less similarity index 100% rename from assets/css/font-awesome/less/stacked.less rename to src/assets/css/font-awesome/less/stacked.less diff --git a/assets/css/font-awesome/less/variables.less b/src/assets/css/font-awesome/less/variables.less similarity index 100% rename from assets/css/font-awesome/less/variables.less rename to src/assets/css/font-awesome/less/variables.less diff --git a/assets/css/font-awesome/scss/font-awesome.scss b/src/assets/css/font-awesome/scss/font-awesome.scss similarity index 100% rename from assets/css/font-awesome/scss/font-awesome.scss rename to src/assets/css/font-awesome/scss/font-awesome.scss diff --git a/assets/css/index.css b/src/assets/css/index.css similarity index 100% rename from assets/css/index.css rename to src/assets/css/index.css diff --git a/assets/css/map-design.css b/src/assets/css/map-design.css similarity index 100% rename from assets/css/map-design.css rename to src/assets/css/map-design.css diff --git a/assets/css/map.css b/src/assets/css/map.css similarity index 100% rename from assets/css/map.css rename to src/assets/css/map.css diff --git a/assets/css/normalize.css b/src/assets/css/normalize.css similarity index 100% rename from assets/css/normalize.css rename to src/assets/css/normalize.css diff --git a/assets/geojson/20171218.geojson b/src/assets/geojson/20171218.geojson similarity index 100% rename from assets/geojson/20171218.geojson rename to src/assets/geojson/20171218.geojson diff --git a/assets/geojson/20171224.geojson b/src/assets/geojson/20171224.geojson similarity index 100% rename from assets/geojson/20171224.geojson rename to src/assets/geojson/20171224.geojson diff --git a/assets/geojson/common.geojson b/src/assets/geojson/common.geojson similarity index 100% rename from assets/geojson/common.geojson rename to src/assets/geojson/common.geojson diff --git a/assets/geojson/fond_guerre.geojson b/src/assets/geojson/fond_guerre.geojson similarity index 100% rename from assets/geojson/fond_guerre.geojson rename to src/assets/geojson/fond_guerre.geojson diff --git a/assets/geojson/searchtest.geojson b/src/assets/geojson/searchtest.geojson similarity index 100% rename from assets/geojson/searchtest.geojson rename to src/assets/geojson/searchtest.geojson diff --git a/assets/icon/aed.png b/src/assets/icon/aed.png similarity index 100% rename from assets/icon/aed.png rename to src/assets/icon/aed.png diff --git a/assets/icon/camera.png b/src/assets/icon/camera.png similarity index 100% rename from assets/icon/camera.png rename to src/assets/icon/camera.png diff --git a/assets/img/bg.png b/src/assets/img/bg.png similarity index 100% rename from assets/img/bg.png rename to src/assets/img/bg.png diff --git a/assets/img/chanyou/avator.jpg b/src/assets/img/chanyou/avator.jpg similarity index 100% rename from assets/img/chanyou/avator.jpg rename to src/assets/img/chanyou/avator.jpg diff --git a/assets/img/chanyou/bg.jpg b/src/assets/img/chanyou/bg.jpg similarity index 100% rename from assets/img/chanyou/bg.jpg rename to src/assets/img/chanyou/bg.jpg diff --git a/assets/img/kaneko/avator.jpg b/src/assets/img/kaneko/avator.jpg similarity index 100% rename from assets/img/kaneko/avator.jpg rename to src/assets/img/kaneko/avator.jpg diff --git a/assets/img/kaneko/bg.jpg b/src/assets/img/kaneko/bg.jpg similarity index 100% rename from assets/img/kaneko/bg.jpg rename to src/assets/img/kaneko/bg.jpg diff --git a/assets/img/koba/avator.png b/src/assets/img/koba/avator.png similarity index 100% rename from assets/img/koba/avator.png rename to src/assets/img/koba/avator.png diff --git a/assets/img/koba/bg.jpg b/src/assets/img/koba/bg.jpg similarity index 100% rename from assets/img/koba/bg.jpg rename to src/assets/img/koba/bg.jpg diff --git a/assets/img/miyamoto/avator.jpg b/src/assets/img/miyamoto/avator.jpg similarity index 100% rename from assets/img/miyamoto/avator.jpg rename to src/assets/img/miyamoto/avator.jpg diff --git a/assets/img/miyamoto/bg.jpg b/src/assets/img/miyamoto/bg.jpg similarity index 100% rename from assets/img/miyamoto/bg.jpg rename to src/assets/img/miyamoto/bg.jpg diff --git a/assets/img/mori/avator.jpg b/src/assets/img/mori/avator.jpg similarity index 100% rename from assets/img/mori/avator.jpg rename to src/assets/img/mori/avator.jpg diff --git a/assets/img/mori/bg.jpg b/src/assets/img/mori/bg.jpg similarity index 100% rename from assets/img/mori/bg.jpg rename to src/assets/img/mori/bg.jpg diff --git a/assets/img/mori/moribg.jpg b/src/assets/img/mori/moribg.jpg similarity index 100% rename from assets/img/mori/moribg.jpg rename to src/assets/img/mori/moribg.jpg diff --git a/assets/img/nitta/avator.jpg b/src/assets/img/nitta/avator.jpg similarity index 100% rename from assets/img/nitta/avator.jpg rename to src/assets/img/nitta/avator.jpg diff --git a/assets/img/nitta/bg.jpg b/src/assets/img/nitta/bg.jpg similarity index 100% rename from assets/img/nitta/bg.jpg rename to src/assets/img/nitta/bg.jpg diff --git a/assets/img/ochiai/avator.jpg b/src/assets/img/ochiai/avator.jpg similarity index 100% rename from assets/img/ochiai/avator.jpg rename to src/assets/img/ochiai/avator.jpg diff --git a/assets/img/ochiai/bg.jpg b/src/assets/img/ochiai/bg.jpg similarity index 100% rename from assets/img/ochiai/bg.jpg rename to src/assets/img/ochiai/bg.jpg diff --git a/assets/img/ohtsuka/avator.png b/src/assets/img/ohtsuka/avator.png similarity index 100% rename from assets/img/ohtsuka/avator.png rename to src/assets/img/ohtsuka/avator.png diff --git a/assets/img/ohtsuka/bg.jpg b/src/assets/img/ohtsuka/bg.jpg similarity index 100% rename from assets/img/ohtsuka/bg.jpg rename to src/assets/img/ohtsuka/bg.jpg diff --git a/assets/img/original/chanyou/avator.jpg b/src/assets/img/original/chanyou/avator.jpg similarity index 100% rename from assets/img/original/chanyou/avator.jpg rename to src/assets/img/original/chanyou/avator.jpg diff --git a/assets/img/original/chanyou/bg.jpg b/src/assets/img/original/chanyou/bg.jpg similarity index 100% rename from assets/img/original/chanyou/bg.jpg rename to src/assets/img/original/chanyou/bg.jpg diff --git a/assets/img/original/kaneko/avator.jpg b/src/assets/img/original/kaneko/avator.jpg similarity index 100% rename from assets/img/original/kaneko/avator.jpg rename to src/assets/img/original/kaneko/avator.jpg diff --git a/assets/img/original/kaneko/bg.jpg b/src/assets/img/original/kaneko/bg.jpg similarity index 100% rename from assets/img/original/kaneko/bg.jpg rename to src/assets/img/original/kaneko/bg.jpg diff --git a/assets/img/original/koba/avator.png b/src/assets/img/original/koba/avator.png similarity index 100% rename from assets/img/original/koba/avator.png rename to src/assets/img/original/koba/avator.png diff --git a/assets/img/original/koba/bg.jpg b/src/assets/img/original/koba/bg.jpg similarity index 100% rename from assets/img/original/koba/bg.jpg rename to src/assets/img/original/koba/bg.jpg diff --git a/assets/img/original/miyamoto/avator.jpg b/src/assets/img/original/miyamoto/avator.jpg similarity index 100% rename from assets/img/original/miyamoto/avator.jpg rename to src/assets/img/original/miyamoto/avator.jpg diff --git a/assets/img/original/miyamoto/bg.jpg b/src/assets/img/original/miyamoto/bg.jpg similarity index 100% rename from assets/img/original/miyamoto/bg.jpg rename to src/assets/img/original/miyamoto/bg.jpg diff --git a/assets/img/original/mori/avator.jpg b/src/assets/img/original/mori/avator.jpg similarity index 100% rename from assets/img/original/mori/avator.jpg rename to src/assets/img/original/mori/avator.jpg diff --git a/assets/img/original/mori/bg.jpg b/src/assets/img/original/mori/bg.jpg similarity index 100% rename from assets/img/original/mori/bg.jpg rename to src/assets/img/original/mori/bg.jpg diff --git a/assets/img/original/mori/moribg.jpg b/src/assets/img/original/mori/moribg.jpg similarity index 100% rename from assets/img/original/mori/moribg.jpg rename to src/assets/img/original/mori/moribg.jpg diff --git a/assets/img/original/nitta/avator.jpg b/src/assets/img/original/nitta/avator.jpg similarity index 100% rename from assets/img/original/nitta/avator.jpg rename to src/assets/img/original/nitta/avator.jpg diff --git a/assets/img/original/nitta/bg.jpg b/src/assets/img/original/nitta/bg.jpg similarity index 100% rename from assets/img/original/nitta/bg.jpg rename to src/assets/img/original/nitta/bg.jpg diff --git a/assets/img/original/ochiai/avator.png b/src/assets/img/original/ochiai/avator.png similarity index 100% rename from assets/img/original/ochiai/avator.png rename to src/assets/img/original/ochiai/avator.png diff --git a/assets/img/original/ochiai/bg.png b/src/assets/img/original/ochiai/bg.png similarity index 100% rename from assets/img/original/ochiai/bg.png rename to src/assets/img/original/ochiai/bg.png diff --git a/assets/img/original/ohtsuka/avator.png b/src/assets/img/original/ohtsuka/avator.png similarity index 100% rename from assets/img/original/ohtsuka/avator.png rename to src/assets/img/original/ohtsuka/avator.png diff --git a/assets/img/original/ohtsuka/bg.png b/src/assets/img/original/ohtsuka/bg.png similarity index 100% rename from assets/img/original/ohtsuka/bg.png rename to src/assets/img/original/ohtsuka/bg.png diff --git a/assets/img/original/sin/avator.jpg b/src/assets/img/original/sin/avator.jpg similarity index 100% rename from assets/img/original/sin/avator.jpg rename to src/assets/img/original/sin/avator.jpg diff --git a/assets/img/original/sin/bg.jpg b/src/assets/img/original/sin/bg.jpg similarity index 100% rename from assets/img/original/sin/bg.jpg rename to src/assets/img/original/sin/bg.jpg diff --git a/assets/img/original/sin/bg.png b/src/assets/img/original/sin/bg.png similarity index 100% rename from assets/img/original/sin/bg.png rename to src/assets/img/original/sin/bg.png diff --git a/assets/img/original/tommy/avator.jpg b/src/assets/img/original/tommy/avator.jpg similarity index 100% rename from assets/img/original/tommy/avator.jpg rename to src/assets/img/original/tommy/avator.jpg diff --git a/assets/img/original/tommy/bg.jpg b/src/assets/img/original/tommy/bg.jpg similarity index 100% rename from assets/img/original/tommy/bg.jpg rename to src/assets/img/original/tommy/bg.jpg diff --git a/assets/img/pta01.png b/src/assets/img/pta01.png similarity index 100% rename from assets/img/pta01.png rename to src/assets/img/pta01.png diff --git a/assets/img/sin/avator.jpg b/src/assets/img/sin/avator.jpg similarity index 100% rename from assets/img/sin/avator.jpg rename to src/assets/img/sin/avator.jpg diff --git a/assets/img/sin/bg.jpg b/src/assets/img/sin/bg.jpg similarity index 100% rename from assets/img/sin/bg.jpg rename to src/assets/img/sin/bg.jpg diff --git a/assets/img/tommy/avator.jpg b/src/assets/img/tommy/avator.jpg similarity index 100% rename from assets/img/tommy/avator.jpg rename to src/assets/img/tommy/avator.jpg diff --git a/assets/img/tommy/bg.jpg b/src/assets/img/tommy/bg.jpg similarity index 100% rename from assets/img/tommy/bg.jpg rename to src/assets/img/tommy/bg.jpg diff --git a/assets/img/top01_img.jpg b/src/assets/img/top01_img.jpg similarity index 100% rename from assets/img/top01_img.jpg rename to src/assets/img/top01_img.jpg diff --git a/assets/js/buttoncontrol.js b/src/assets/js/buttoncontrol.js similarity index 100% rename from assets/js/buttoncontrol.js rename to src/assets/js/buttoncontrol.js diff --git a/assets/js/geolocaton.js b/src/assets/js/geolocaton.js similarity index 100% rename from assets/js/geolocaton.js rename to src/assets/js/geolocaton.js diff --git a/assets/js/gps.js b/src/assets/js/gps.js similarity index 100% rename from assets/js/gps.js rename to src/assets/js/gps.js diff --git a/assets/js/main.js b/src/assets/js/main.js similarity index 100% rename from assets/js/main.js rename to src/assets/js/main.js diff --git a/assets/js/map-design.js b/src/assets/js/map-design.js similarity index 100% rename from assets/js/map-design.js rename to src/assets/js/map-design.js diff --git a/assets/js/popup.js b/src/assets/js/popup.js similarity index 100% rename from assets/js/popup.js rename to src/assets/js/popup.js diff --git a/assets/js/view.js b/src/assets/js/view.js similarity index 100% rename from assets/js/view.js rename to src/assets/js/view.js diff --git a/assets/layers/base.js b/src/assets/layers/base.js similarity index 100% rename from assets/layers/base.js rename to src/assets/layers/base.js diff --git a/assets/layers/overlay.js b/src/assets/layers/overlay.js similarity index 100% rename from assets/layers/overlay.js rename to src/assets/layers/overlay.js diff --git a/assets/libs/bootstrap.min.js b/src/assets/libs/bootstrap.min.js similarity index 100% rename from assets/libs/bootstrap.min.js rename to src/assets/libs/bootstrap.min.js diff --git a/assets/libs/jquery.min.js b/src/assets/libs/jquery.min.js similarity index 100% rename from assets/libs/jquery.min.js rename to src/assets/libs/jquery.min.js diff --git a/assets/libs/ol-hash.js b/src/assets/libs/ol-hash.js similarity index 100% rename from assets/libs/ol-hash.js rename to src/assets/libs/ol-hash.js diff --git a/assets/libs/ol/ol.css b/src/assets/libs/ol/ol.css similarity index 100% rename from assets/libs/ol/ol.css rename to src/assets/libs/ol/ol.css diff --git a/assets/libs/ol/ol.js b/src/assets/libs/ol/ol.js similarity index 100% rename from assets/libs/ol/ol.js rename to src/assets/libs/ol/ol.js diff --git a/assets/libs/ol3-ext.css b/src/assets/libs/ol3-ext.css similarity index 100% rename from assets/libs/ol3-ext.css rename to src/assets/libs/ol3-ext.css diff --git a/assets/libs/ol3-ext_popupoverlay/popupoverlay.css b/src/assets/libs/ol3-ext_popupoverlay/popupoverlay.css similarity index 100% rename from assets/libs/ol3-ext_popupoverlay/popupoverlay.css rename to src/assets/libs/ol3-ext_popupoverlay/popupoverlay.css diff --git a/assets/libs/ol3-ext_popupoverlay/popupoverlay.js b/src/assets/libs/ol3-ext_popupoverlay/popupoverlay.js similarity index 100% rename from assets/libs/ol3-ext_popupoverlay/popupoverlay.js rename to src/assets/libs/ol3-ext_popupoverlay/popupoverlay.js diff --git a/assets/libs/ol3-layerswitcher/ol3-layerswitcher.css b/src/assets/libs/ol3-layerswitcher/ol3-layerswitcher.css similarity index 100% rename from assets/libs/ol3-layerswitcher/ol3-layerswitcher.css rename to src/assets/libs/ol3-layerswitcher/ol3-layerswitcher.css diff --git a/assets/libs/ol3-layerswitcher/ol3-layerswitcher.js b/src/assets/libs/ol3-layerswitcher/ol3-layerswitcher.js similarity index 100% rename from assets/libs/ol3-layerswitcher/ol3-layerswitcher.js rename to src/assets/libs/ol3-layerswitcher/ol3-layerswitcher.js diff --git a/assets/libs/ol3-search/searchcontrol.css b/src/assets/libs/ol3-search/searchcontrol.css similarity index 100% rename from assets/libs/ol3-search/searchcontrol.css rename to src/assets/libs/ol3-search/searchcontrol.css diff --git a/assets/libs/ol3-search/searchcontrol.js b/src/assets/libs/ol3-search/searchcontrol.js similarity index 100% rename from assets/libs/ol3-search/searchcontrol.js rename to src/assets/libs/ol3-search/searchcontrol.js diff --git a/assets/libs/ol3-search/searchfeaturecontrol.js b/src/assets/libs/ol3-search/searchfeaturecontrol.js similarity index 100% rename from assets/libs/ol3-search/searchfeaturecontrol.js rename to src/assets/libs/ol3-search/searchfeaturecontrol.js diff --git a/assets/tiles2/17/113809/52253.png b/src/assets/tiles2/17/113809/52253.png similarity index 100% rename from assets/tiles2/17/113809/52253.png rename to src/assets/tiles2/17/113809/52253.png diff --git a/assets/tiles2/17/113809/52254.png b/src/assets/tiles2/17/113809/52254.png similarity index 100% rename from assets/tiles2/17/113809/52254.png rename to src/assets/tiles2/17/113809/52254.png diff --git a/assets/tiles2/17/113809/52255.png b/src/assets/tiles2/17/113809/52255.png similarity index 100% rename from assets/tiles2/17/113809/52255.png rename to src/assets/tiles2/17/113809/52255.png diff --git a/assets/tiles2/17/113809/52256.png b/src/assets/tiles2/17/113809/52256.png similarity index 100% rename from assets/tiles2/17/113809/52256.png rename to src/assets/tiles2/17/113809/52256.png diff --git a/assets/tiles2/17/113809/52257.png b/src/assets/tiles2/17/113809/52257.png similarity index 100% rename from assets/tiles2/17/113809/52257.png rename to src/assets/tiles2/17/113809/52257.png diff --git a/assets/tiles2/17/113809/52258.png b/src/assets/tiles2/17/113809/52258.png similarity index 100% rename from assets/tiles2/17/113809/52258.png rename to src/assets/tiles2/17/113809/52258.png diff --git a/assets/tiles2/17/113809/52259.png b/src/assets/tiles2/17/113809/52259.png similarity index 100% rename from assets/tiles2/17/113809/52259.png rename to src/assets/tiles2/17/113809/52259.png diff --git a/assets/tiles2/17/113809/52260.png b/src/assets/tiles2/17/113809/52260.png similarity index 100% rename from assets/tiles2/17/113809/52260.png rename to src/assets/tiles2/17/113809/52260.png diff --git a/assets/tiles2/17/113810/52253.png b/src/assets/tiles2/17/113810/52253.png similarity index 100% rename from assets/tiles2/17/113810/52253.png rename to src/assets/tiles2/17/113810/52253.png diff --git a/assets/tiles2/17/113810/52254.png b/src/assets/tiles2/17/113810/52254.png similarity index 100% rename from assets/tiles2/17/113810/52254.png rename to src/assets/tiles2/17/113810/52254.png diff --git a/assets/tiles2/17/113810/52255.png b/src/assets/tiles2/17/113810/52255.png similarity index 100% rename from assets/tiles2/17/113810/52255.png rename to src/assets/tiles2/17/113810/52255.png diff --git a/assets/tiles2/17/113810/52256.png b/src/assets/tiles2/17/113810/52256.png similarity index 100% rename from assets/tiles2/17/113810/52256.png rename to src/assets/tiles2/17/113810/52256.png diff --git a/assets/tiles2/17/113810/52257.png b/src/assets/tiles2/17/113810/52257.png similarity index 100% rename from assets/tiles2/17/113810/52257.png rename to src/assets/tiles2/17/113810/52257.png diff --git a/assets/tiles2/17/113810/52258.png b/src/assets/tiles2/17/113810/52258.png similarity index 100% rename from assets/tiles2/17/113810/52258.png rename to src/assets/tiles2/17/113810/52258.png diff --git a/assets/tiles2/17/113810/52259.png b/src/assets/tiles2/17/113810/52259.png similarity index 100% rename from assets/tiles2/17/113810/52259.png rename to src/assets/tiles2/17/113810/52259.png diff --git a/assets/tiles2/17/113810/52260.png b/src/assets/tiles2/17/113810/52260.png similarity index 100% rename from assets/tiles2/17/113810/52260.png rename to src/assets/tiles2/17/113810/52260.png diff --git a/assets/tiles2/17/113811/52255.png b/src/assets/tiles2/17/113811/52255.png similarity index 100% rename from assets/tiles2/17/113811/52255.png rename to src/assets/tiles2/17/113811/52255.png diff --git a/assets/tiles2/17/113811/52256.png b/src/assets/tiles2/17/113811/52256.png similarity index 100% rename from assets/tiles2/17/113811/52256.png rename to src/assets/tiles2/17/113811/52256.png diff --git a/assets/tiles2/17/113811/52257.png b/src/assets/tiles2/17/113811/52257.png similarity index 100% rename from assets/tiles2/17/113811/52257.png rename to src/assets/tiles2/17/113811/52257.png diff --git a/assets/tiles2/17/113811/52258.png b/src/assets/tiles2/17/113811/52258.png similarity index 100% rename from assets/tiles2/17/113811/52258.png rename to src/assets/tiles2/17/113811/52258.png diff --git a/assets/tiles2/17/113812/52255.png b/src/assets/tiles2/17/113812/52255.png similarity index 100% rename from assets/tiles2/17/113812/52255.png rename to src/assets/tiles2/17/113812/52255.png diff --git a/assets/tiles2/17/113812/52256.png b/src/assets/tiles2/17/113812/52256.png similarity index 100% rename from assets/tiles2/17/113812/52256.png rename to src/assets/tiles2/17/113812/52256.png diff --git a/assets/tiles2/17/113812/52257.png b/src/assets/tiles2/17/113812/52257.png similarity index 100% rename from assets/tiles2/17/113812/52257.png rename to src/assets/tiles2/17/113812/52257.png diff --git a/assets/tiles2/17/113812/52258.png b/src/assets/tiles2/17/113812/52258.png similarity index 100% rename from assets/tiles2/17/113812/52258.png rename to src/assets/tiles2/17/113812/52258.png diff --git a/assets/tiles2/17/113813/52255.png b/src/assets/tiles2/17/113813/52255.png similarity index 100% rename from assets/tiles2/17/113813/52255.png rename to src/assets/tiles2/17/113813/52255.png diff --git a/assets/tiles2/17/113813/52256.png b/src/assets/tiles2/17/113813/52256.png similarity index 100% rename from assets/tiles2/17/113813/52256.png rename to src/assets/tiles2/17/113813/52256.png diff --git a/assets/tiles2/17/113813/52257.png b/src/assets/tiles2/17/113813/52257.png similarity index 100% rename from assets/tiles2/17/113813/52257.png rename to src/assets/tiles2/17/113813/52257.png diff --git a/assets/tiles2/17/113813/52258.png b/src/assets/tiles2/17/113813/52258.png similarity index 100% rename from assets/tiles2/17/113813/52258.png rename to src/assets/tiles2/17/113813/52258.png diff --git a/assets/tiles2/17/113814/52255.png b/src/assets/tiles2/17/113814/52255.png similarity index 100% rename from assets/tiles2/17/113814/52255.png rename to src/assets/tiles2/17/113814/52255.png diff --git a/assets/tiles2/17/113814/52256.png b/src/assets/tiles2/17/113814/52256.png similarity index 100% rename from assets/tiles2/17/113814/52256.png rename to src/assets/tiles2/17/113814/52256.png diff --git a/assets/tiles2/17/113814/52257.png b/src/assets/tiles2/17/113814/52257.png similarity index 100% rename from assets/tiles2/17/113814/52257.png rename to src/assets/tiles2/17/113814/52257.png diff --git a/assets/tiles2/17/113814/52258.png b/src/assets/tiles2/17/113814/52258.png similarity index 100% rename from assets/tiles2/17/113814/52258.png rename to src/assets/tiles2/17/113814/52258.png diff --git a/assets/tiles2/17/113815/52255.png b/src/assets/tiles2/17/113815/52255.png similarity index 100% rename from assets/tiles2/17/113815/52255.png rename to src/assets/tiles2/17/113815/52255.png diff --git a/assets/tiles2/17/113815/52256.png b/src/assets/tiles2/17/113815/52256.png similarity index 100% rename from assets/tiles2/17/113815/52256.png rename to src/assets/tiles2/17/113815/52256.png diff --git a/assets/tiles2/17/113815/52257.png b/src/assets/tiles2/17/113815/52257.png similarity index 100% rename from assets/tiles2/17/113815/52257.png rename to src/assets/tiles2/17/113815/52257.png diff --git a/assets/tiles2/17/113815/52258.png b/src/assets/tiles2/17/113815/52258.png similarity index 100% rename from assets/tiles2/17/113815/52258.png rename to src/assets/tiles2/17/113815/52258.png diff --git a/assets/tiles2/17/113816/52255.png b/src/assets/tiles2/17/113816/52255.png similarity index 100% rename from assets/tiles2/17/113816/52255.png rename to src/assets/tiles2/17/113816/52255.png diff --git a/assets/tiles2/17/113816/52256.png b/src/assets/tiles2/17/113816/52256.png similarity index 100% rename from assets/tiles2/17/113816/52256.png rename to src/assets/tiles2/17/113816/52256.png diff --git a/assets/tiles2/17/113816/52257.png b/src/assets/tiles2/17/113816/52257.png similarity index 100% rename from assets/tiles2/17/113816/52257.png rename to src/assets/tiles2/17/113816/52257.png diff --git a/assets/tiles2/17/113816/52258.png b/src/assets/tiles2/17/113816/52258.png similarity index 100% rename from assets/tiles2/17/113816/52258.png rename to src/assets/tiles2/17/113816/52258.png diff --git a/assets/tiles2/17/113817/52255.png b/src/assets/tiles2/17/113817/52255.png similarity index 100% rename from assets/tiles2/17/113817/52255.png rename to src/assets/tiles2/17/113817/52255.png diff --git a/assets/tiles2/17/113817/52256.png b/src/assets/tiles2/17/113817/52256.png similarity index 100% rename from assets/tiles2/17/113817/52256.png rename to src/assets/tiles2/17/113817/52256.png diff --git a/assets/tiles2/17/113817/52257.png b/src/assets/tiles2/17/113817/52257.png similarity index 100% rename from assets/tiles2/17/113817/52257.png rename to src/assets/tiles2/17/113817/52257.png diff --git a/assets/tiles2/17/113817/52258.png b/src/assets/tiles2/17/113817/52258.png similarity index 100% rename from assets/tiles2/17/113817/52258.png rename to src/assets/tiles2/17/113817/52258.png diff --git a/assets/tiles2/17/113818/52253.png b/src/assets/tiles2/17/113818/52253.png similarity index 100% rename from assets/tiles2/17/113818/52253.png rename to src/assets/tiles2/17/113818/52253.png diff --git a/assets/tiles2/17/113818/52254.png b/src/assets/tiles2/17/113818/52254.png similarity index 100% rename from assets/tiles2/17/113818/52254.png rename to src/assets/tiles2/17/113818/52254.png diff --git a/assets/tiles2/17/113818/52255.png b/src/assets/tiles2/17/113818/52255.png similarity index 100% rename from assets/tiles2/17/113818/52255.png rename to src/assets/tiles2/17/113818/52255.png diff --git a/assets/tiles2/17/113818/52256.png b/src/assets/tiles2/17/113818/52256.png similarity index 100% rename from assets/tiles2/17/113818/52256.png rename to src/assets/tiles2/17/113818/52256.png diff --git a/assets/tiles2/17/113818/52257.png b/src/assets/tiles2/17/113818/52257.png similarity index 100% rename from assets/tiles2/17/113818/52257.png rename to src/assets/tiles2/17/113818/52257.png diff --git a/assets/tiles2/17/113818/52258.png b/src/assets/tiles2/17/113818/52258.png similarity index 100% rename from assets/tiles2/17/113818/52258.png rename to src/assets/tiles2/17/113818/52258.png diff --git a/assets/tiles2/17/113818/52259.png b/src/assets/tiles2/17/113818/52259.png similarity index 100% rename from assets/tiles2/17/113818/52259.png rename to src/assets/tiles2/17/113818/52259.png diff --git a/assets/tiles2/17/113818/52260.png b/src/assets/tiles2/17/113818/52260.png similarity index 100% rename from assets/tiles2/17/113818/52260.png rename to src/assets/tiles2/17/113818/52260.png diff --git a/assets/tiles2/17/113819/52253.png b/src/assets/tiles2/17/113819/52253.png similarity index 100% rename from assets/tiles2/17/113819/52253.png rename to src/assets/tiles2/17/113819/52253.png diff --git a/assets/tiles2/17/113819/52254.png b/src/assets/tiles2/17/113819/52254.png similarity index 100% rename from assets/tiles2/17/113819/52254.png rename to src/assets/tiles2/17/113819/52254.png diff --git a/assets/tiles2/17/113819/52255.png b/src/assets/tiles2/17/113819/52255.png similarity index 100% rename from assets/tiles2/17/113819/52255.png rename to src/assets/tiles2/17/113819/52255.png diff --git a/assets/tiles2/17/113819/52256.png b/src/assets/tiles2/17/113819/52256.png similarity index 100% rename from assets/tiles2/17/113819/52256.png rename to src/assets/tiles2/17/113819/52256.png diff --git a/assets/tiles2/17/113819/52257.png b/src/assets/tiles2/17/113819/52257.png similarity index 100% rename from assets/tiles2/17/113819/52257.png rename to src/assets/tiles2/17/113819/52257.png diff --git a/assets/tiles2/17/113819/52259.png b/src/assets/tiles2/17/113819/52259.png similarity index 100% rename from assets/tiles2/17/113819/52259.png rename to src/assets/tiles2/17/113819/52259.png diff --git a/assets/tiles2/17/113819/52260.png b/src/assets/tiles2/17/113819/52260.png similarity index 100% rename from assets/tiles2/17/113819/52260.png rename to src/assets/tiles2/17/113819/52260.png diff --git a/history.html b/src/history.html similarity index 100% rename from history.html rename to src/history.html diff --git a/index.html b/src/index.html similarity index 100% rename from index.html rename to src/index.html diff --git a/manual.html b/src/manual.html similarity index 100% rename from manual.html rename to src/manual.html diff --git a/map.html b/src/map.html similarity index 100% rename from map.html rename to src/map.html From e9ef71baa397d6a1378ce8e1aa1d4684e6e983b6 Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 21:11:17 +0900 Subject: [PATCH 07/12] =?UTF-8?q?confrict=E8=B5=B7=E3=81=8D=E3=81=A6?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=82=E3=81=AE=E3=81=AE=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 9 + .eslintrc.js | 19 + .gitignore | 12 + .vscode/settings.json | 62 ++ README.md | 90 ++- package.json | 18 + yarn.lock | 1334 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 1513 insertions(+), 31 deletions(-) create mode 100644 .editorconfig create mode 100644 .eslintrc.js create mode 100644 .vscode/settings.json create mode 100644 package.json create mode 100644 yarn.lock diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9d08a1a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..3d14dcb --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,19 @@ +module.exports = { + env: { + browser: true, + es6: true + }, + extends: ['eslint:recommended'], + parserOptions: { + parser: 'babel-eslint', + ecmaVersion: 6, + sourceType: 'module' + }, + rules: { + 'no-console': 'off', + 'linebreak-style': ['error', 'unix'], + indent: ['error', 2], + quotes: ['error', 'single'], + semi: ['error', 'always'] + } +}; diff --git a/.gitignore b/.gitignore index 9b12789..f1f9598 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,16 @@ _*.* index.php composer.json + .DS_Store +node_modules/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +*.suo +*.ntvs* +*.njsproj +*.sln diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..46e57f9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,62 @@ +{ + "workbench.startupEditor": "newUntitledFile", + "workbench.colorTheme": "One Dark Pro", + "editor.detectIndentation": false, + "editor.fontFamily": "Ricty Diminished", + "editor.fontSize": 18, + "diffEditor.renderSideBySide": false, // Git の差分を行内に表示 + "editor.colorDecorators": false, // カラーデコレーターを非表示 + "editor.formatOnPaste": true, // ペースト時に自動でフォーマット + "editor.formatOnSave": true, // ファイル保存時に自動でフォーマット + "editor.formatOnType": true, // 入力した行を自動でフォーマット + "editor.minimap.renderCharacters": false, // ミニマップの表示文字をブロックに変更 + "editor.minimap.showSlider": "always", // 表示領域をミニマップで常にハイライト + "editor.multiCursorModifier": "ctrlCmd", // マウスでの複数選択時の修飾キーを変更 + "editor.renderControlCharacters": true, // 制御文字を表示 + "editor.renderLineHighlight": "all", // 選択行を行番号含めすべてハイライト + "editor.renderWhitespace": "all", // 半角スペースを常に表示 + "editor.snippetSuggestions": "top", // Emmet などのスニペット候補を優先して表示 + "editor.tabSize": 2, // タブのサイズ変更 + "editor.wordWrap": "on", // エディターの幅で折り返し + "editor.insertSpaces": true, + "emmet.showSuggestionsAsSnippets": true, // Emmet の候補を表示 + "emmet.triggerExpansionOnTab": true, // TAB キーで Emmet を展開できるようにする + "emmet.variables": { + // Emmet で展開される HTML の言語を変更 + "lang": "ja" + }, + "explorer.confirmDelete": false, // ファイル削除時の確認を表示しない + "files.associations": { + // ファイルと言語の関連付けを変更 + ".*lintrc": "json" + }, + "files.exclude": { + // エクスプローラーから非表示にするファイル + "**/*.map": true, + "**/node_modules": true + }, + "files.insertFinalNewline": true, // ファイルの保存時に末尾を改行 + "files.trimFinalNewlines": true, // ファイルの保存時に最終行以降をトリミング + "files.trimTrailingWhitespace": true, // ファイルの保存時に行末の空白をトリミング + "[markdown]": { + "files.trimTrailingWhitespace": false // Markdown のファイルは行末の空白をトリミングしない + }, + "html.format.contentUnformatted": + "pre, code, textarea, title, h1, h2, h3, h4, h5, h6, p", // タグ内の記述はフォーマットしない + "html.format.extraLiners": "", // head, body, /html タグの前に改行を入れない + "html.format.unformatted": null, // フレージング・コンテンツ（旧インライン要素のようなタグ）はフォーマットしない + "html.format.wrapLineLength": 120, // 行の文字数制限を無くし自動で改行させない + "search.exclude": { + // 検索対象外にするファイル設定（ files.exclude のファイルも含む） + "**/tmp": true + }, + "window.openFoldersInNewWindow": "on", // 新規ワークスペースを別ウインドウで開く + "window.title": "${activeEditorMedium}${separator}${rootName}", // ウインドウ上部に表示する文字列の設定 + "workbench.editor.labelFormat": "short", // タブに表示する文字列の設定 + "workbench.editor.tabSizing": "shrink", + "workbench.iconTheme": "material-icon-theme", + "window.zoomLevel": 0, // タブの表示設定 + "files.eol": "\n", + "prettier.singleQuote": true, + "eslint.validate": ["javascript"] +} diff --git a/README.md b/README.md index f66f6e0..8c686f0 100644 --- a/README.md +++ b/README.md @@ -1,42 +1,49 @@ # kure_kosen_map ---- + ## 使い方 -1. 各自featureブランチで開発する -1. ある程度できたらdevelpブランチにプルリクエスト、マージする -1. 動作確認終了後masterブランチにマージ ---- + +1. 各自 feature ブランチで開発する +2. ある程度できたら develp ブランチにプルリクエスト、マージする +3. 動作確認終了後 master ブランチにマージ + ## 開発環境 -* OpenLayers : 4.5.0 -* jQuery : 3.2.1(slim) -* Bootstrap : 4.0.0-beta.2 -* popper : 1.12.3 -* FontAwesome : 5.0.2 ---- + +- OpenLayers : 4.5.0 +- jQuery : 3.2.1(slim) +- Bootstrap : 4.0.0-beta.2 +- popper : 1.12.3 +- FontAwesome : 5.0.2 + ## 開発時の注意 -* ローカルのgeojsonが読めないときは、CORSが原因の可能性あり -1. Chromeを終了 -1. Win + R で下記を実行 -```chrome.exe --disable-web-security --user-data-dir``` ---- +- ローカルの geojson が読めないときは、CORS が原因の可能性あり + + 1.Chrome を終了 + 1.Win + R で下記を実行 + `chrome.exe --disable-web-security --user-data-dir` + ## コードの統一化 + ### Tag -* CSS : `````` -* JavaScript : `````` + +- CSS : `` +- JavaScript : `` ### CDN -* jQuery : `````` -* Popper : `````` +- jQuery : `` -* Bootstrap(JS) : `````` +- Popper : `` -* Bootstrap(CSS) : `````` +- Bootstrap(JS) : `` -* Font Awesome : `````` +- Bootstrap(CSS) : `` -* Set : -``` +- Font Awesome : `` + +- Set : + +```html @@ -44,13 +51,34 @@ ``` ---- ## aidmiya + ### ここでの編集方針 -1. 基本的に自分がいじるのは自分で作ったファイルの中(map-design.cssなど) -1. いじりたいところが他の人の作ったファイルにあったら、そのファイルをいじくる(map.cssなど) + +1. 基本的に自分がいじるのは自分で作ったファイルの中(map-design.css など) +1. いじりたいところが他の人の作ったファイルにあったら、そのファイルをいじくる(map.css など) ### 動作テストについて -* aidmiyaのPC上での動作確認: Firefox(57 32bit Ubuntu)、Chromium(63 32bit Ubuntu) -* aidmiyaのモバイルでの動作確認: Safari running on iPhone 6S Plus -* Safariのシークレットモードで動作確認する時、CSSが読み込まれないことがある。その時は、シークレットを解除してリロードしてみよう + +- aidmiya の PC 上での動作確認: Firefox(57 32bit Ubuntu)、Chromium(63 32bit Ubuntu) +- aidmiya のモバイルでの動作確認: Safari running on iPhone 6S Plus +- Safari のシークレットモードで動作確認する時、CSS が読み込まれないことがある。その時は、シークレットを解除してリロードしてみよう + +## 新開発環境について（執筆中） + +### エディタ周り + +vscode なら以下の拡張機能を入れる + +- [Prettier formatter for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + +### パッケージ周り + +#### yarn + +1. [これ](https://qiita.com/masterkey1009/items/50f95b1187646a7db385)などを参考に yarn を入れる +1. クローン後 `yarn install` する + +### プルリクエストについて + +- `yarn format`を使ってコードを`prettier`で整形しておくこと diff --git a/package.json b/package.json new file mode 100644 index 0000000..534cdce --- /dev/null +++ b/package.json @@ -0,0 +1,18 @@ +{ + "name": "kure_kosen_map", + "version": "1.0.0", + "main": "index.js", + "repository": "git@github.com:kure-kosen/kure_kosen_map.git", + "author": "kobakakzu0429 ", + "license": "MIT", + "scripts": { + "format": "prettier-eslint --write \"src/assets/js/**/*.js\"" + }, + "devDependencies": { + "babel-eslint": "^8.2.3", + "eslint": "^4.19.1", + "eslint-config-standard": "^11.0.0", + "prettier-eslint": "^8.8.1", + "prettier-eslint-cli": "^4.7.1" + } +} diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..236b910 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,1334 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9" + dependencies: + "@babel/highlight" "7.0.0-beta.44" + +"@babel/generator@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42" + dependencies: + "@babel/types" "7.0.0-beta.44" + jsesc "^2.5.1" + lodash "^4.2.0" + source-map "^0.5.0" + trim-right "^1.0.1" + +"@babel/helper-function-name@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd" + dependencies: + "@babel/helper-get-function-arity" "7.0.0-beta.44" + "@babel/template" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + +"@babel/helper-get-function-arity@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15" + dependencies: + "@babel/types" "7.0.0-beta.44" + +"@babel/helper-split-export-declaration@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc" + dependencies: + "@babel/types" "7.0.0-beta.44" + +"@babel/highlight@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +"@babel/template@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" + dependencies: + "@babel/code-frame" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" + lodash "^4.2.0" + +"@babel/traverse@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966" + dependencies: + "@babel/code-frame" "7.0.0-beta.44" + "@babel/generator" "7.0.0-beta.44" + "@babel/helper-function-name" "7.0.0-beta.44" + "@babel/helper-split-export-declaration" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" + debug "^3.1.0" + globals "^11.1.0" + invariant "^2.2.0" + lodash "^4.2.0" + +"@babel/types@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757" + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +acorn-jsx@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" + dependencies: + acorn "^3.0.4" + +acorn@^3.0.4: + version "3.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" + +acorn@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" + +ajv-keywords@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" + +ajv@^5.2.3, ajv@^5.3.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + +ansi-escapes@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + dependencies: + sprintf-js "~1.0.2" + +array-union@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + +arrify@^1.0.0, arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + +babel-code-frame@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-eslint@^8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf" + dependencies: + "@babel/code-frame" "7.0.0-beta.44" + "@babel/traverse" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" + +babel-runtime@^6.23.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babylon@7.0.0-beta.44: + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +boolify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz#b5c09e17cacd113d11b7bb3ed384cc012994d86b" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer-from@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" + +caller-path@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" + dependencies: + callsites "^0.2.0" + +callsites@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" + +camelcase-keys@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" + dependencies: + camelcase "^4.1.0" + map-obj "^2.0.0" + quick-lru "^1.0.0" + +camelcase@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +chalk@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + +circular-json@^0.3.1: + version "0.3.3" + resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + dependencies: + restore-cursor "^2.0.0" + +cli-width@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" + +cliui@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +color-convert@^1.9.0: + version "1.9.2" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147" + dependencies: + color-name "1.1.1" + +color-name@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689" + +common-tags@^1.4.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +concat-stream@^1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +core-js@^2.4.0: + version "2.5.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +cross-spawn@^5.0.1, cross-spawn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + +decamelize@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + +del@^2.0.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" + dependencies: + globby "^5.0.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + rimraf "^2.2.8" + +dlv@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + dependencies: + esutils "^2.0.2" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +eslint-config-standard@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz#87ee0d3c9d95382dc761958cbb23da9eea31e0ba" + +eslint-scope@^3.7.1, eslint-scope@~3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + +eslint@^4.0.0, eslint@^4.19.1, eslint@^4.5.0: + version "4.19.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" + dependencies: + ajv "^5.3.0" + babel-code-frame "^6.22.0" + chalk "^2.1.0" + concat-stream "^1.6.0" + cross-spawn "^5.1.0" + debug "^3.1.0" + doctrine "^2.1.0" + eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" + espree "^3.5.4" + esquery "^1.0.0" + esutils "^2.0.2" + file-entry-cache "^2.0.0" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.0.1" + ignore "^3.3.3" + imurmurhash "^0.1.4" + inquirer "^3.0.6" + is-resolvable "^1.0.0" + js-yaml "^3.9.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.4" + minimatch "^3.0.2" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + pluralize "^7.0.0" + progress "^2.0.0" + regexpp "^1.0.1" + require-uncached "^1.0.3" + semver "^5.3.0" + strip-ansi "^4.0.0" + strip-json-comments "~2.0.1" + table "4.0.2" + text-table "~0.2.0" + +espree@^3.5.4: + version "3.5.4" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" + dependencies: + acorn "^5.5.0" + acorn-jsx "^3.0.0" + +esprima@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" + +esquery@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" + dependencies: + estraverse "^4.0.0" + +esrecurse@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" + dependencies: + estraverse "^4.1.0" + +estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" + +esutils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +external-editor@^2.0.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + +fast-deep-equal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fast-levenshtein@~2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + dependencies: + escape-string-regexp "^1.0.5" + +file-entry-cache@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" + dependencies: + flat-cache "^1.2.1" + object-assign "^4.0.1" + +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + dependencies: + locate-path "^2.0.0" + +flat-cache@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" + dependencies: + circular-json "^0.3.1" + del "^2.0.2" + graceful-fs "^4.1.2" + write "^0.2.1" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + +get-caller-file@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" + +get-stdin@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" + +get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@~7.0.6: + version "7.0.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.0.1, globals@^11.1.0: + version "11.7.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673" + +globby@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" + dependencies: + array-union "^1.0.1" + arrify "^1.0.0" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +graceful-fs@^4.1.2: + version "4.1.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + dependencies: + ansi-regex "^2.0.0" + +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +iconv-lite@^0.4.17: + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ignore@^3.2.7, ignore@^3.3.3: + version "3.3.10" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +indent-string@^3.1.0, indent-string@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +inquirer@^3.0.6: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.4" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.1.0" + strip-ansi "^4.0.0" + through "^2.3.6" + +invariant@^2.2.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + dependencies: + loose-envify "^1.0.0" + +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-path-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" + +is-path-in-cwd@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" + dependencies: + is-path-inside "^1.0.0" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + +is-resolvable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +js-tokens@^3.0.0, js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + +js-yaml@^3.9.1: + version "3.12.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsesc@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe" + +json-schema-traverse@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + dependencies: + invert-kv "^1.0.0" + +levn@^0.3.0, levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + +lodash.merge@^4.6.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" + +lodash.unescape@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" + +lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + +loglevel-colored-level-prefix@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e" + dependencies: + chalk "^1.1.3" + loglevel "^1.4.1" + +loglevel@^1.4.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" + +loose-envify@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" + dependencies: + js-tokens "^3.0.0" + +lru-cache@^4.0.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +make-plural@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.2.0.tgz#03edfc34a2aee630a57e209369ef26ee3ca69590" + optionalDependencies: + minimist "^1.2.0" + +map-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" + +mem@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" + dependencies: + mimic-fn "^1.0.0" + +messageformat-parser@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-1.1.0.tgz#13ba2250a76bbde8e0fca0dbb3475f95c594a90a" + +messageformat@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-1.1.1.tgz#ceaa2e6c86929d4807058275a7372b1bd963bdf6" + dependencies: + glob "~7.0.6" + make-plural "^4.1.1" + messageformat-parser "^1.1.0" + nopt "~3.0.6" + reserved-words "^0.1.2" + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + +minimatch@^3.0.2, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + +nopt@~3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + dependencies: + abbrev "1" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +object-assign@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + dependencies: + mimic-fn "^1.0.0" + +optionator@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.4" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + wordwrap "~1.0.0" + +os-locale@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" + dependencies: + execa "^0.7.0" + lcid "^1.0.0" + mem "^1.1.0" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + dependencies: + p-try "^1.0.0" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + dependencies: + p-limit "^1.1.0" + +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1, path-is-inside@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +pluralize@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + +prettier-eslint-cli@^4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-4.7.1.tgz#3d103c494baa4e80b99ad53e2b9db7620101859f" + dependencies: + arrify "^1.0.1" + babel-runtime "^6.23.0" + boolify "^1.0.0" + camelcase-keys "^4.1.0" + chalk "2.3.0" + common-tags "^1.4.0" + eslint "^4.5.0" + find-up "^2.1.0" + get-stdin "^5.0.1" + glob "^7.1.1" + ignore "^3.2.7" + indent-string "^3.1.0" + lodash.memoize "^4.1.2" + loglevel-colored-level-prefix "^1.0.0" + messageformat "^1.0.2" + prettier-eslint "^8.5.0" + rxjs "^5.3.0" + yargs "10.0.3" + +prettier-eslint@^8.5.0, prettier-eslint@^8.8.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-8.8.1.tgz#38505163274742f2a0b31653c39e40f37ebd07da" + dependencies: + babel-runtime "^6.26.0" + common-tags "^1.4.0" + dlv "^1.1.0" + eslint "^4.0.0" + indent-string "^3.2.0" + lodash.merge "^4.6.0" + loglevel-colored-level-prefix "^1.0.0" + prettier "^1.7.0" + pretty-format "^22.0.3" + require-relative "^0.8.7" + typescript "^2.5.1" + typescript-eslint-parser "^11.0.0" + +prettier@^1.7.0: + version "1.13.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0" + +pretty-format@^22.0.3: + version "22.4.3" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f" + dependencies: + ansi-regex "^3.0.0" + ansi-styles "^3.2.0" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +progress@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +quick-lru@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" + +readable-stream@^2.2.2: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + +regexpp@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +require-relative@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" + +require-uncached@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" + dependencies: + caller-path "^0.1.0" + resolve-from "^1.0.0" + +reserved-words@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" + +resolve-from@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +rimraf@^2.2.8: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +run-async@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" + dependencies: + is-promise "^2.1.0" + +rx-lite-aggregates@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" + dependencies: + rx-lite "*" + +rx-lite@*, rx-lite@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" + +rxjs@^5.3.0: + version "5.5.11" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" + dependencies: + symbol-observable "1.0.1" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +semver@5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + +semver@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +slice-ansi@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + dependencies: + is-fullwidth-code-point "^2.0.0" + +source-map@^0.5.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^4.0.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + dependencies: + has-flag "^2.0.0" + +supports-color@^5.3.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + +symbol-observable@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" + +table@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" + dependencies: + ajv "^5.2.3" + ajv-keywords "^2.1.0" + chalk "^2.1.0" + lodash "^4.17.4" + slice-ansi "1.0.0" + string-width "^2.1.1" + +text-table@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + dependencies: + os-tmpdir "~1.0.2" + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + dependencies: + prelude-ls "~1.1.2" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + +typescript-eslint-parser@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-11.0.0.tgz#37dba6a0130dd307504aa4b4b21b0d3dc7d4e9f2" + dependencies: + lodash.unescape "4.0.1" + semver "5.4.1" + +typescript@^2.5.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + dependencies: + isexe "^2.0.0" + +wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" + dependencies: + mkdirp "^0.5.1" + +y18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yargs-parser@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" + dependencies: + camelcase "^4.1.0" + +yargs@10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae" + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + find-up "^2.1.0" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^8.0.0" From a814f1c030b5b6a27d7a2149c39c36fd521601fa Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 21:13:10 +0900 Subject: [PATCH 08/12] =?UTF-8?q?confrict=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/map.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/map.html b/src/map.html index b311896..b801ec8 100644 --- a/src/map.html +++ b/src/map.html @@ -7,7 +7,6 @@ - 呉高専マップ @@ -15,14 +14,14 @@
- +
@@ -100,7 +99,6 @@
-
@@ -125,7 +123,8 @@

Options:

  • - maxInputs: + maxInputs:
  • search property: @@ -137,11 +136,13 @@

    Options:

    +
- + @@ -166,6 +167,5 @@

Options:

- From dd2678e8441cf7578ee1e3bce21ef4612b997720 Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 21:17:06 +0900 Subject: [PATCH 09/12] =?UTF-8?q?confrict=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/libs/ol3-search/searchcontrol.js | 106 +++++++++--------- .../libs/ol3-search/searchfeaturecontrol.js | 12 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/assets/libs/ol3-search/searchcontrol.js b/src/assets/libs/ol3-search/searchcontrol.js index ccc6aab..1f5a22b 100644 --- a/src/assets/libs/ol3-search/searchcontrol.js +++ b/src/assets/libs/ol3-search/searchcontrol.js @@ -21,65 +21,65 @@ ol.control.Search = function(options) { if (!options) options = {}; if (options.typing == undefined) options.typing = 300; var element; - element = $("
").addClass("search"); - $(element).on("click", "#reset", function() { + element = $('
').addClass('search'); + $(element).on('click', '#reset', function() { _resets(); }); // Search input var tout, - cur = ""; - $("") - .attr("type", "search") - .attr("onfocus", "_resets()") - .attr("id", "search") + cur = ''; + $('') + .attr('type', 'search') + .attr('onfocus', '_resets()') + .attr('id', 'search') .addClass() - .attr("placeholder", options.placeholder || "Search...") - .on("change", function(e) { + .attr('placeholder', options.placeholder || 'Search...') + .on('change', function(e) { self.dispatchEvent({ - type: "change:input", + type: 'change:input', input: e, value: $(this).val() }); }) - .on("keyup search cut paste input", function(e) { - var li = $("ul li", element); + .on('keyup search cut paste input', function(e) { + var li = $('ul li', element); var val = $(this).val(); // move up/down if ( - e.key == "ArrowDown" || - e.key == "ArrowUp" || - e.key == "Down" || - e.key == "Up" + e.key == 'ArrowDown' || + e.key == 'ArrowUp' || + e.key == 'Down' || + e.key == 'Up' ) { - li.removeClass("select"); + li.removeClass('select'); li = /Down/.test(e.key) ? li.next() : li.prev(); - if (li.length) li.addClass("select"); + if (li.length) li.addClass('select'); else - $("ul li", element) + $('ul li', element) .first() - .addClass("select"); + .addClass('select'); } // Clear input - else if (e.type == "input" && !val) { + else if (e.type == 'input' && !val) { _resets(); self.drawList_(); } // Select in the list - else if (li.length && (e.type == "search" || e.key == "Enter")) { - if (element.hasClass("ol-control")) $(this).blur(); - li.removeClass("select"); + else if (li.length && (e.type == 'search' || e.key == 'Enter')) { + if (element.hasClass('ol-control')) $(this).blur(); + li.removeClass('select'); cur = val; - self.select(li.data("search")); + self.select(li.data('search')); } // Search / autocomplete else if ( - e.type == "search" || - e.key == "Enter" || + e.type == 'search' || + e.key == 'Enter' || (cur != val && options.typing >= 0) ) { // current search @@ -88,7 +88,7 @@ ol.control.Search = function(options) { // prevent searching on each typing if (tout) clearTimeout(tout); tout = setTimeout(function() { - if (cur.length >= self.get("minLength")) { + if (cur.length >= self.get('minLength')) { var s = self.autocomplete(cur, function(auto) { self.drawList_(auto); }); @@ -102,31 +102,31 @@ ol.control.Search = function(options) { .appendTo(element); // Delete input - $("") - .attr({ type: "reset", id: "reset" }) - .val("×") + $('') + .attr({ type: 'reset', id: 'reset' }) + .val('×') .appendTo(element); // Result - var _result = $("
") - .attr("id", "_result") - .addClass("result") + var _result = $('
') + .attr('id', '_result') + .addClass('result') .appendTo(element); // Autocomplete list - $("
    ").appendTo(_result); + $('
      ').appendTo(_result); ol.control.Control.call(this, { element: element.get(0), target: options.target }); - if (typeof options.getTitle == "function") this.getTitle = options.getTitle; - if (typeof options.autocomplete == "function") + if (typeof options.getTitle == 'function') this.getTitle = options.getTitle; + if (typeof options.autocomplete == 'function') this.autocomplete = options.autocomplete; // Options - this.set("minLength", options.minLength || 1); - this.set("maxItems", options.maxItems || 10); + this.set('minLength', options.minLength || 1); + this.set('maxItems', options.maxItems || 10); }; ol.inherits(ol.control.Search, ol.control.Control); @@ -136,12 +136,12 @@ ol.inherits(ol.control.Search, ol.control.Control); // @return {string} the text to be displayed in the index, default f.name // @api ol.control.Search.prototype.getTitle = function(f) { - return f.name || "No title"; + return f.name || 'No title'; }; // Force search to refresh ol.control.Search.prototype.search = function() { - $("input.search", this.element).trigger("search"); + $('input.search', this.element).trigger('search'); }; // Set the input value in the form (for initialisation purpose) @@ -149,8 +149,8 @@ ol.control.Search.prototype.search = function() { // @param {boolean} search to start a search // @api ol.control.Search.prototype.setInput = function(value, search) { - $("input.search", this.element).val(value); - if (search) $("input.search", this.element).trigger("keyup"); + $('input.search', this.element).val(value); + if (search) $('input.search', this.element).trigger('keyup'); }; // A ligne has been clicked in the menu > dispatch event @@ -159,7 +159,7 @@ ol.control.Search.prototype.setInput = function(value, search) { // ol.control.Search.prototype.select = function(f) { this.dispatchEvent({ - type: "select", + type: 'select', search: f }); }; @@ -177,26 +177,26 @@ ol.control.Search.prototype.autocomplete = function(s, cback) { // Draw the list // @param {Array} auto an array of search result ol.control.Search.prototype.drawList_ = function(auto) { - var ul = $("ul", this.element).html(""); + var ul = $('ul', this.element).html(''); if (!auto) return; var self = this; - var max = Math.min(self.get("maxItems"), auto.length); + var max = Math.min(self.get('maxItems'), auto.length); for (var i = 0; i < max; i++) { _resultVisible(); - $("
    • ") + $('
    • ') .html(self.getTitle(auto[i])) - .data("search", auto[i]) + .data('search', auto[i]) .click(function(e) { - self.select($(this).data("search")); + self.select($(this).data('search')); }) .appendTo(ul); } }; -const _resultVisible = () => $("#_result").css("visibility", "visible"); -const _resultHidden = () => $("#_result").css("visibility", "hidden"); +const _resultVisible = () => $('#_result').css('visibility', 'visible'); +const _resultHidden = () => $('#_result').css('visibility', 'hidden'); const _resets = () => { - $("#search").val(""); - $("li", "#_result").remove(); + $('#search').val(''); + $('li', '#_result').remove(); _resultHidden(); }; diff --git a/src/assets/libs/ol3-search/searchfeaturecontrol.js b/src/assets/libs/ol3-search/searchfeaturecontrol.js index 6b99fa1..91d4916 100644 --- a/src/assets/libs/ol3-search/searchfeaturecontrol.js +++ b/src/assets/libs/ol3-search/searchfeaturecontrol.js @@ -21,9 +21,9 @@ ol.control.SearchFeature = function(options) { if (!options) options = {}; ol.control.Search.call(this, options); - if (typeof options.getSearchString == "function") + if (typeof options.getSearchString == 'function') this.getSearchString = options.getSearchString; - this.set("property", "name"); //ここで指定 + this.set('property', 'name'); //ここで指定 this.source_ = options.source; }; @@ -35,7 +35,7 @@ ol.inherits(ol.control.SearchFeature, ol.control.Search); // @return {string} the text to be displayed in the index // @api ol.control.SearchFeature.prototype.getTitle = function(f) { - return f.get(this.get("property") || "name"); + return f.get(this.get('property') || 'name'); }; // --------------------------------------------------- @@ -56,11 +56,11 @@ ol.control.SearchFeature.prototype.getSearchString = function(f) { ol.control.SearchFeature.prototype.autocomplete = function(s, cback) { var result = []; // regexp - s = s.replace(/^\*/, ""); - var rex = new RegExp(s, "i"); + s = s.replace(/^\*/, ''); + var rex = new RegExp(s, 'i'); // The source var features = this.source_.getFeatures(); - var max = this.get("maxItems"); + var max = this.get('maxItems'); for (var i = 0, f; (f = features[i]); i++) { if (rex.test(this.getSearchString(f))) { result.push(f); From 791dbe8f72415a5b85e0f3bc98fcba740af7c16b Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 21:17:49 +0900 Subject: [PATCH 10/12] =?UTF-8?q?confrict=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/geolocaton.js | 28 +++++++++++++++------------- src/assets/js/gps.js | 11 ++++++----- src/assets/js/view.js | 4 ++-- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/assets/js/geolocaton.js b/src/assets/js/geolocaton.js index e3dfa06..1f1bd55 100644 --- a/src/assets/js/geolocaton.js +++ b/src/assets/js/geolocaton.js @@ -31,22 +31,24 @@ geolocation.on('change:accuracyGeometry', function() { }); var positionFeature = new ol.Feature(); -positionFeature.setStyle(new ol.style.Style({ - image: new ol.style.Circle({ - radius: 6, - fill: new ol.style.Fill({ - color: '#3399CC' - }), - stroke: new ol.style.Stroke({ - color: '#fff', - width: 2 +positionFeature.setStyle( + new ol.style.Style({ + image: new ol.style.Circle({ + radius: 6, + fill: new ol.style.Fill({ + color: '#3399CC' + }), + stroke: new ol.style.Stroke({ + color: '#fff', + width: 2 + }) }) }) -})); +); geolocation.on('change:position', function() { var coordinates = geolocation.getPosition(); - positionFeature.setGeometry(coordinates ? - new ol.geom.Point(coordinates) : null); + positionFeature.setGeometry( + coordinates ? new ol.geom.Point(coordinates) : null + ); }); - diff --git a/src/assets/js/gps.js b/src/assets/js/gps.js index c6c5c27..f03dea4 100644 --- a/src/assets/js/gps.js +++ b/src/assets/js/gps.js @@ -1,16 +1,17 @@ -var kakudo = 0, timerArray = new Array(); +var kakudo = 0, + timerArray = new Array(); var get_dir = function() { window.addEventListener('deviceorientation', function(e) { kakudo = e.webkitCompassHeading; view.animate({ - rotation: kakudo * Math.PI / 180 + rotation: (kakudo * Math.PI) / 180 }); }); -} +}; $('#direction').on('change', function() { - if($('#direction').prop("checked")) { + if ($('#direction').prop('checked')) { start_interval(); } else { stop_interval(); @@ -28,7 +29,7 @@ function start_interval() { function stop_interval() { if (timerArray.length > 0) { for (var i = 0, j = timerArray.length; i < j; i++) { - clearInterval(timerArray .shift()); + clearInterval(timerArray.shift()); } } } diff --git a/src/assets/js/view.js b/src/assets/js/view.js index a6bb970..dd00671 100644 --- a/src/assets/js/view.js +++ b/src/assets/js/view.js @@ -1,8 +1,8 @@ var view = new ol.View({ - center: ol.proj.fromLonLat([132.601271,34.232102]), + center: ol.proj.fromLonLat([132.601271, 34.232102]), zoom: 17.5, // minZoom: 15,//挙動がおかしいからやめたほうがいいかも // maxZoom: 17 // そもそもいらないかな？ rotation: -0.36911708366090856 -}); \ No newline at end of file +}); From 0d59ca345fb0a77b03d8d194c765879e5ca89afc Mon Sep 17 00:00:00 2001 From: kobakakzu0429 Date: Fri, 29 Jun 2018 21:32:51 +0900 Subject: [PATCH 11/12] =?UTF-8?q?buttoncontrol=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/buttoncontrol.js | 56 ---------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 src/assets/js/buttoncontrol.js diff --git a/src/assets/js/buttoncontrol.js b/src/assets/js/buttoncontrol.js deleted file mode 100644 index fad9ff8..0000000 --- a/src/assets/js/buttoncontrol.js +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (c) 2016 Jean-Marc VIGLINO, - released under the CeCILL-B license (French BSD license) - (http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt). -*/ -/** A simple push button control -* @constructor -* @extends {ol.control.Control} -* @param {Object=} options Control options. -* @param {String} options.className class of the control -* @param {String} options.title title of the control -* @param {String} options.html html to insert in the control -* @param {function} options.handleClick callback when control is clicked (or use change:active event) -*/ -ol.control.Button = function(options) -{ options = options || {}; - var element = $("
      ").addClass((options.className||"") + ' ol-button ol-unselectable ol-control'); - var self = this; - - var bt = $("