fixed color bug and fontsize bug from merge

dist/vis.js

@@ -11262,7 +11262,7 @@ function Popup(container, x, y, text, style) {
   styleAttr.visibility = "hidden";
   styleAttr.border = "1px solid " + style.color.border;
   styleAttr.color = style.fontColor;
-  styleAttr.fontSize = style.fontSize;
+  styleAttr.fontSize = style.fontSize + "px";
   styleAttr.fontFamily = style.fontFace;
   styleAttr.padding = this.padding + "px";
   styleAttr.backgroundColor = style.color.background;
@@ -16677,6 +16677,7 @@ Graph.prototype.setOptions = function (options) {
 
       if (options.edges.color !== undefined) {
         if (util.isString(options.edges.color)) {
+          this.constants.edges.color = {};
           this.constants.edges.color.color = options.edges.color;
           this.constants.edges.color.highlight = options.edges.color;
         }

src/graph/Graph.js

@@ -629,6 +629,7 @@ Graph.prototype.setOptions = function (options) {
 
       if (options.edges.color !== undefined) {
         if (util.isString(options.edges.color)) {
+          this.constants.edges.color = {};
           this.constants.edges.color.color = options.edges.color;
           this.constants.edges.color.highlight = options.edges.color;
         }

src/graph/Popup.js

@@ -55,7 +55,7 @@ function Popup(container, x, y, text, style) {
   styleAttr.visibility = "hidden";
   styleAttr.border = "1px solid " + style.color.border;
   styleAttr.color = style.fontColor;
-  styleAttr.fontSize = style.fontSize;
+  styleAttr.fontSize = style.fontSize + "px";
   styleAttr.fontFamily = style.fontFace;
   styleAttr.padding = this.padding + "px";
   styleAttr.backgroundColor = style.color.background;