Merge 099c591 into 057bc61

hasgeek · Nov 28, 2018 · 8d09706 · 8d09706
2 parents 057bc61 + 099c591
commit 8d09706
Show file tree

Hide file tree

Showing 20 changed files with 741 additions and 41 deletions.
diff --git a/baseframe/assets.py b/baseframe/assets.py
@@ -92,6 +92,9 @@
 
 assets['jquery-easytabs.js'][Version('3.2.0')] = ('jquery.js', 'baseframe/js/jquery-easytabs.js')
 
+# jQuery plugin for truncating multiple lines of text
+assets['jquery.succinct.js'][Version('1.1.0')] = ('jquery.js', 'baseframe/js/jquery.succinct.js')
+
 assets['select2.js'][Version('4.0.3')] = ('jquery.js>=1.7.2', 'baseframe/js/select2.js')
 assets['select2.css'][Version('4.0.3')] = 'baseframe/css/select2.css'
 assets['select2-bootstrap.css'][Version('0.1.0')] = ('select2.css', 'baseframe/css/bootstrap-select2.css')
@@ -200,6 +203,11 @@
 
 assets['marked.js'][Version('0.3.0')] = 'baseframe/js/marked.js'
 
+assets['leaflet.js'][Version('1.3.4')] = 'baseframe/js/leaflet.js'
+assets['leaflet.css'][Version('1.3.4')] = 'baseframe/css/leaflet.css'
+assets['leaflet-search.css'][Version('2.9.7')] = 'baseframe/css/leaflet-search.css'
+assets['leaflet-search.js'][Version('2.9.7')] = 'baseframe/js/leaflet-search.js'
+
 # Font Awesome
 assets['fontawesome.css'][Version('3.1.0')] = 'baseframe/css/fontawesome-3.1.css'
 assets['fontawesome.css'][Version('4.7.0')] = 'baseframe/css/fontawesome-4.7.css'

diff --git a/baseframe/static/css/leaflet-search.css b/baseframe/static/css/leaflet-search.css