Merge pull request #478 from ocefpaf/update_fa

Update font-awesome

Author: ocefpaf

CHANGES.txt

@@ -1,15 +1,18 @@
 0.3.0
 ~~~~~
 
-- Add fullscreen plugin (sanga #437)
-- Add ColorLine object (bibmartin #449)
-- Add smooth_factor option to GeoJSON, TopoJSON and Choropleth (JamesGardiner #428)
-- Add options to fullscreen plugin (qingkaikong #468)
-- Add options to LayerControl (qingkaikong #473)
+- Added fullscreen plugin (sanga #437)
+- Added ColorLine object (bibmartin #449)
+- Added smooth_factor option to GeoJSON, TopoJSON and Choropleth (JamesGardiner #428)
+- Added options to fullscreen plugin (qingkaikong #468)
+- Added options to LayerControl (qingkaikong #473)
+- Added text path (talespaiva #451 and #474)
+- Update font-awesome to 4.6.3 (ocefpaf #478)
 
 Bug Fixes
 
 - Fix MIME type (text/plain) is not executable (talespaiva #440)
+- Update Travis-CI testing to incorporate branca and fix notebook tests (ocefpaf #436)
 
 0.2.1
 ~~~~~

folium/map.py

@@ -43,7 +43,7 @@
     ("bootstrap_theme_css",
      "https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"),  # noqa
     ("awesome_markers_font_css",
-     "https://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"),  # noqa
+     "https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"),  # noqa
     ("awesome_markers_css",
      "https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"),  # noqa
     ("marker_cluster_default_css",

folium/templates/fol_template.html

@@ -12,7 +12,7 @@
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
-   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"/>
+   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"/>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"/>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"/>