style tweaks, fixes maproulette#235

mvexel · Dec 10, 2016 · 869ed5c · 869ed5c
1 parent 286fa0a
commit 869ed5c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/assets/javascripts/mapping.js b/app/assets/javascripts/mapping.js
@@ -1,5 +1,10 @@
 toastr.options.positionClass = "notification-position";
 
+// Globals
+
+// Max width of marker balloon text
+var MAX_BALLOON_TEXT_WIDTH=40;
+
 L.TileLayer.Common = L.TileLayer.extend({
     initialize: function (options) {
         L.TileLayer.prototype.initialize.call(this, this.url, options);
@@ -727,18 +732,16 @@ var MRManager = (function() {
                         counter++;
                         var v = feature.properties[k];
                         var printLine = k+": "+v;
-                        if(printLine.length > 22){
-                                popupString += printLine.slice(0,20)+".."+ '<br />';
-
-                            }
-                        else{
+                        if(printLine.length > MAX_BALLOON_TEXT_WIDTH){
+                            popupString += printLine.slice(0,(MAX_BALLOON_TEXT_WIDTH - 2))+".."+ '<br />';
+                        } else{
                             popupString += printLine+ '<br />';
                         }
                     }
                     popupString += '</div>';
                     if (counter > 0) {
                         layer.bindPopup(popupString, {
-                            maxHeight: 200
+                            maxHeight: 250
                         });
                     }
                 }

diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -26,4 +26,4 @@ body, html {
 .word-wrap {
   overflow-wrap: break-word;
   word-wrap: break-word;
-}
+}
diff --git a/app/assets/stylesheets/mapping.less b/app/assets/stylesheets/mapping.less
@@ -6,10 +6,14 @@
   bottom:50px;
   left:50px;
   overflow: hidden;
-  font-family: 'Helvetica', 'Arial', sans-serif;
+  font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-size: 11pt;
 }
 
+#map .popup {
+    font-size:10px;
+}
+
 .top-item {
   z-index: 99999999999;
 }