AtlasOfLivingAustralia/maintenance#63

- Fixing various asset loading issues
AtlasOfLivingAustralia · Sep 14, 2017 · 5e537fd · 5e537fd
1 parent 0ef5e1b
commit 5e537fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/grails-app/assets/stylesheets/ala/images-client.css b/grails-app/assets/stylesheets/ala/images-client.css
@@ -1,8 +1,9 @@
 /*
  * Replaces image-viewer resource in old resources plugin
  *= encoding UTF-8
- * // require jquery
- * // require bootstrap
  *= require leaflet_all.css
- *= require font-awesome/css/font-awesome-4.3.0.css
+ * bootstrap, font-awesome and jquery are provided by ala-bootstrap3
+ **** = require jquery
+ **** = require font-awesome/css/font-awesome-4.3.0.css
+ **** = require bootstrap
  */
diff --git a/grails-app/assets/vendor/leaflet_all.css b/grails-app/assets/vendor/leaflet_all.css
@@ -1,7 +1,7 @@
 /*
 *= encoding UTF-8
 *= require leaflet/leaflet
-*= require leaflet/leaflet.muasure
+*= require leaflet/leaflet.measure
 *= require leaflet/Control.FullScreen
 *= require_tree leaflet.draw
 *= require_tree leaflet.loading

diff --git a/grails-app/assets/vendor/leaflet_all.js b/grails-app/assets/vendor/leaflet_all.js
@@ -1,6 +1,6 @@
 //= encoding UTF-8
 //= require leaflet/leaflet
-//= require leaflet/leaflet.muasure
+//= require leaflet/leaflet.measure
 //= require leaflet/Control.FullScreen
 //= require_tree leaflet.draw
 //= require_tree leaflet.loading