[guadec-web: 10/10] Merge branch 'map' into 'master'

[Oliver Gutiérrez <ogutierrez src gnome org>]

commit 1f1544bf49bc73d9fe405c0626a3c92bc89cb689
Merge: b31ba67 75f9aac
Author: Oliver Gutiérrez <ogutsua gmail com>
Date:   Wed Jun 27 10:57:54 2018 +0000

    Merge branch 'map' into 'master'
    
    Map v2
    
    See merge request Infrastructure/guadec-web!25

 Gruntfile.js                                       |   12 +-
 content/pages/map.md                               |  392 +-
 src/js/guadec_map/.gitignore                       |    2 +
 src/js/guadec_map/guadec-map-style.json            | 5893 ++++++++++++++++++++
 src/js/guadec_map/guadec-map.js                    |  338 ++
 src/js/guadec_map/maki-guadec-svg/airport-45.svg   |   49 +
 src/js/guadec_map/maki-guadec-svg/bank-45.svg      |   48 +
 src/js/guadec_map/maki-guadec-svg/bar-45.svg       |   52 +
 src/js/guadec_map/maki-guadec-svg/bus-45.svg       |   48 +
 src/js/guadec_map/maki-guadec-svg/cafe-45.svg      |   51 +
 src/js/guadec_map/maki-guadec-svg/circle-11.svg    |    7 +
 src/js/guadec_map/maki-guadec-svg/circle-45.svg    |   51 +
 .../maki-guadec-svg/gnome-guadec-blue.svg          |   72 +
 .../maki-guadec-svg/gnome-guadec-red.svg           |   72 +
 .../maki-guadec-svg/gnome-guadec-yellow.svg        |   72 +
 src/js/guadec_map/maki-guadec-svg/home-45.svg      |   51 +
 src/js/guadec_map/maki-guadec-svg/hospital-45.svg  |   51 +
 src/js/guadec_map/maki-guadec-svg/karaoke-45.svg   |   55 +
 src/js/guadec_map/maki-guadec-svg/lodging-45.svg   |   48 +
 src/js/guadec_map/maki-guadec-svg/marker-45.svg    |   48 +
 src/js/guadec_map/maki-guadec-svg/music-45.svg     |   51 +
 src/js/guadec_map/maki-guadec-svg/park-45.svg      |   51 +
 src/js/guadec_map/maki-guadec-svg/parking-45.svg   |   51 +
 src/js/guadec_map/maki-guadec-svg/rail-45.svg      |   51 +
 .../guadec_map/maki-guadec-svg/restaurant-45.svg   |   51 +
 src/js/guadec_map/maki-guadec-svg/rocket-45.svg    |   51 +
 src/js/guadec_map/maki-guadec-svg/star-11.svg      |   10 +
 src/js/guadec_map/maki-guadec-svg/star-45.svg      |   52 +
 src/js/guadec_map/maki-guadec-svg/suitcase-45.svg  |   49 +
 src/js/guadec_map/maki-guadec-svg/theatre-45.svg   |   51 +
 src/js/guadec_map/maki-guadec-svg/town-hall-45.svg |   51 +
 src/js/guadec_map/maki-guadec-svg/village-45.svg   |   48 +
 src/js/guadec_map/sprite.json                      |  191 +
 src/js/guadec_map/sprite.png                       |  Bin 0 -> 16588 bytes
 src/js/guadec_map/sprite 2x json                   |  191 +
 src/js/guadec_map/sprite 2x png                    |  Bin 0 -> 37353 bytes
 36 files changed, 8036 insertions(+), 325 deletions(-)
---