Skip to content

Commit 4e6e6e4

Browse files
authored
Bootstrap 5 (#1644)
* include bootstrap 3 glyphicons for awesome marker * Create bootstrap-3-glyphicons.min.css * upgrade bootstrap 3.2.0 -> 5.2.2 * include glyphicons css * fix end of line * run tests with feature branch * revert back to future link
1 parent 35b2ca4 commit 4e6e6e4

7 files changed

+868
-4
lines changed

folium/folium.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
('jquery',
3030
'https://code.jquery.com/jquery-1.12.4.min.js'),
3131
('bootstrap',
32-
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js'),
32+
'https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js'),
3333
('awesome_markers',
3434
'https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js'), # noqa
3535
]
@@ -38,9 +38,10 @@
3838
('leaflet_css',
3939
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.css'),
4040
('bootstrap_css',
41-
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'),
42-
('bootstrap_theme_css',
43-
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css'), # noqa
41+
'https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css'),
42+
# glyphicons came from Bootstrap 3 and are used for Awesome Markers
43+
('glyphicons_css',
44+
'https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/bootstrap_3_glyphicons/bootstrap-3-glyphicons.css'), # noqa
4445
('awesome_markers_font_css',
4546
'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css'), # noqa
4647
('awesome_markers_css',

0 commit comments

Comments
 (0)