Merge remote-tracking branch 'upstream/master'

044d0553 · Rashid Khan · 094226f6 · 699c43ff · 044d0553 · 044d0553
Commit 044d0553 authored Sep 30, 2013 by Rashid Khan
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

src/app/panels/bettermap/module.css
+5 -0

src/app/panels/bettermap/module.js
+1 -0

No files found.
--- a/src/app/panels/bettermap/module.css
+++ b/src/app/panels/bettermap/module.css
+/** custom additions **/
+.leaflet-marker-icon {
+  color: #333;
+}
\ No newline at end of file
--- a/src/app/panels/bettermap/module.js
+++ b/src/app/panels/bettermap/module.js
@@ -15,6 +15,7 @@ define([
  './leaflet/leaflet-src',
  'require',

+  'css!./module.css',
  'css!./leaflet/leaflet.css',
  'css!./leaflet/plugins.css'
 ],