Update to upstream

Update file contents to upstream.
Discard scss file and use css.

Change-Id: Ibbbf9d05bd04e4b623f22a2a0f4c01d185c6e0cc

README.txt

@@ -3,11 +3,12 @@ XStatic-Vis
 
 Vis JavaScript and SCSS library packaged for setuptools (easy_install) / pip.
 
-This package is intended to be used by **any** project that needs these files.
+This package includes all non-minified files of Vis distribution folder,
+and is intended to be used by **any** project that needs these files.
 
 It intentionally does **not** provide any extra code except some metadata
 **nor** has any extra requirements. You MAY use some minimal support code from
 the XStatic base package, if you like.
 
-You can find more info about the xstatic packaging way in the package `XStatic`.
+You can find more info about the xstatic packaging in the package `XStatic`.
 

xstatic/pkg/vis/data/vis.css

@@ -264,7 +264,7 @@
 }
 
 .vis-item .vis-delete {
-  background: none; 
+  background: url('img/timeline/delete.png') no-repeat center;
   position: absolute;
   width: 24px;
   height: 24px;
@@ -615,7 +615,7 @@ div.vis-network div.vis-manipulation {
 
   position: absolute;
   left: 0;
-  top: 1%;
+  top: 0;
   width: 100%;
   height: 30px;
 }
@@ -638,7 +638,7 @@ div.vis-network div.vis-close {
 
   background-position: 20px 3px;
   background-repeat: no-repeat;
-  background-image: none;
+  background-image: url("img/network/cross.png");
   cursor: pointer;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
@@ -685,7 +685,7 @@ div.vis-network div.vis-manipulation div.vis-button:active {
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-back {
-  background-image: none;
+  background-image: url("img/network/backIcon.png");
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-none:hover {
@@ -704,12 +704,12 @@ div.vis-network div.vis-manipulation div.notification {
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-add {
-  background-image: none;
+  background-image: url("img/network/addNodeIcon.png");
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-edit,
 div.vis-network div.vis-edit-mode div.vis-button.vis-edit {
-  background-image: none;
+  background-image: url("img/network/editIcon.png");
 }
 
 div.vis-network div.vis-edit-mode div.vis-button.vis-edit.vis-edit-mode {
@@ -718,22 +718,22 @@ div.vis-network div.vis-edit-mode div.vis-button.vis-edit.vis-edit-mode {
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-connect {
-  background-image: none;
+  background-image: url("img/network/connectIcon.png");
 }
 
 div.vis-network div.vis-manipulation div.vis-button.vis-delete {
-  background-image: none;
+  background-image: url("img/network/deleteIcon.png");
 }
 /* top right bottom left */
 div.vis-network div.vis-manipulation div.vis-label,
 div.vis-network div.vis-edit-mode div.vis-label {
-  margin: 0 5px;
+  margin: 0 0 0 23px;
   line-height: 25px;
 }
 div.vis-network div.vis-manipulation div.vis-separator-line {
-  display: inline-block;
-  width: 0px;
-  height: 20px;
+  display:inline-block;
+  width:1px;
+  height:20px;
   background-color: #bdbdbd;
   margin: 5px 7px 0 15px;
 }
@@ -774,37 +774,37 @@ div.vis-network div.vis-navigation div.vis-button:active {
 }
 
 div.vis-network div.vis-navigation div.vis-button.vis-up {
-    background-image: none;
+    background-image: url("img/network/upArrow.png");
     bottom:50px;
     left:55px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-down {
-    background-image: none;
+    background-image: url("img/network/downArrow.png");
     bottom:10px;
     left:55px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-left {
-    background-image: none;
+    background-image: url("img/network/leftArrow.png");
     bottom:10px;
     left:15px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-right {
-    background-image: none;
+    background-image: url("img/network/rightArrow.png");
     bottom:10px;
     left:95px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-zoomIn {
-    background-image: none;
+    background-image: url("img/network/plus.png");
     bottom:10px;
     right:15px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-zoomOut {
-    background-image: none;
+    background-image: url("img/network/minus.png");
     bottom:10px;
     right:55px;
 }
 div.vis-network div.vis-navigation div.vis-button.vis-zoomExtends {
-    background-image: none;
+    background-image: url("img/network/zoomExtends.png");
     bottom:50px;
     right:15px;
 }
@@ -1245,4 +1245,4 @@ div.vis-color-picker input.vis-range-brightness {
 
 div.vis-color-picker input.vis-saturation-range {
   width: 289px !important;
-}*/
+}*/

xstatic/pkg/vis/data/vis.js

@@ -38663,7 +38663,6 @@ return /******/ (function(modules) { // webpackBootstrap
           } else {
             this.editModeDiv.style.display = 'block';
           }
-          this.editModeDiv.appendChild(this._createIcon('fa-pencil'))
           this.canvas.frame.appendChild(this.editModeDiv);
         }
 
@@ -38672,7 +38671,6 @@ return /******/ (function(modules) { // webpackBootstrap
           this.closeDiv = document.createElement('div');
           this.closeDiv.className = 'vis-close';
           this.closeDiv.style.display = this.manipulationDiv.style.display;
-          this.closeDiv.appendChild(this._createIcon('fa-times'))
           this.canvas.frame.appendChild(this.closeDiv);
         }
       }
@@ -38715,7 +38713,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
         // create the contents for the editMode button
         var locale = this.options.locales[this.options.locale];
-        var button = this._createButton('editMode', 'vis-button vis-edit vis-edit-mode', locale['edit'] || this.options.locales['en']['edit'], 'fa-pencil');
+        var button = this._createButton('editMode', 'vis-button vis-edit vis-edit-mode', locale['edit'] || this.options.locales['en']['edit']);
         this.editModeDiv.appendChild(button);
 
         // bind a hammer listener to the button, calling the function toggleEditMode.
@@ -38822,82 +38820,62 @@ return /******/ (function(modules) { // webpackBootstrap
       // ----------------------    DOM functions for buttons    --------------------------//
 
       value: function _createAddNodeButton(locale) {
-        var button = this._createButton('addNode', 'vis-button vis-add', locale['addNode'] || this.options.locales['en']['addNode'], 'fa-plus');
+        var button = this._createButton('addNode', 'vis-button vis-add', locale['addNode'] || this.options.locales['en']['addNode']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.addNodeMode.bind(this));
       }
     }, {
       key: '_createAddEdgeButton',
       value: function _createAddEdgeButton(locale) {
-        var button = this._createButton('addEdge', 'vis-button vis-connect', locale['addEdge'] || this.options.locales['en']['addEdge'], 'fa-plus');
+        var button = this._createButton('addEdge', 'vis-button vis-connect', locale['addEdge'] || this.options.locales['en']['addEdge']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.addEdgeMode.bind(this));
       }
     }, {
       key: '_createEditNodeButton',
       value: function _createEditNodeButton(locale) {
-        var button = this._createButton('editNode', 'vis-button vis-edit', locale['editNode'] || this.options.locales['en']['editNode'], 'fa-pencil');
+        var button = this._createButton('editNode', 'vis-button vis-edit', locale['editNode'] || this.options.locales['en']['editNode']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.editNode.bind(this));
       }
     }, {
       key: '_createEditEdgeButton',
       value: function _createEditEdgeButton(locale) {
-        var button = this._createButton('editEdge', 'vis-button vis-edit', locale['editEdge'] || this.options.locales['en']['editEdge'], 'fa-pencil');
+        var button = this._createButton('editEdge', 'vis-button vis-edit', locale['editEdge'] || this.options.locales['en']['editEdge']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.editEdgeMode.bind(this));
       }
     }, {
       key: '_createDeleteButton',
       value: function _createDeleteButton(locale) {
-        var button = this._createButton('delete', 'vis-button vis-delete', locale['del'] || this.options.locales['en']['del'], 'fa-minus');
+        var button = this._createButton('delete', 'vis-button vis-delete', locale['del'] || this.options.locales['en']['del']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.deleteSelected.bind(this));
       }
     }, {
       key: '_createBackButton',
       value: function _createBackButton(locale) {
-        var button = this._createButton('back', 'vis-button vis-back', locale['back'] || this.options.locales['en']['back'], 'fa-arrow-left');
+        var button = this._createButton('back', 'vis-button vis-back', locale['back'] || this.options.locales['en']['back']);
         this.manipulationDiv.appendChild(button);
         this._bindHammerToDiv(button, this.showManipulatorToolbar.bind(this));
       }
     }, {
       key: '_createButton',
-      value: function _createButton(id, className, label, iconClass) {
-        var labelClassName = arguments[4] === undefined ? 'vis-label' : arguments[4];
+      value: function _createButton(id, className, label) {
+        var labelClassName = arguments[3] === undefined ? 'vis-label' : arguments[3];
 
         this.manipulationDOM[id + 'Div'] = document.createElement('div');
         this.manipulationDOM[id + 'Div'].className = className;
         this.manipulationDOM[id + 'Label'] = document.createElement('div');
         this.manipulationDOM[id + 'Label'].className = labelClassName;
-//        this.manipulationDOM[id + 'Label'].innerHTML = label;
-
-        var labelElement = document.createElement('span')
-        if (typeof iconClass != 'undefined' && iconClass != ''){
-          var iconElement = this._createIcon(iconClass);
-          this.manipulationDOM[id + 'Label'].appendChild(iconElement);
-          labelElement.style.fontFamily = 'inherit';
-          labelElement.style.fontSize = '0.9em';
-          labelElement.style.marginLeft = '5px';
-        }
-        labelElement.innerHTML = label;
-        this.manipulationDOM[id + 'Label'].appendChild(labelElement);
-
+        this.manipulationDOM[id + 'Label'].innerHTML = label;
         this.manipulationDOM[id + 'Div'].appendChild(this.manipulationDOM[id + 'Label']);
         return this.manipulationDOM[id + 'Div'];
       }
     }, {
       key: '_createDescription',
       value: function _createDescription(label) {
-        this.manipulationDiv.appendChild(this._createButton('description', 'vis-button vis-none', label, ''));
-      }
-    }, {
-      key: '_createIcon',
-      value: function _createIcon(iconClass){
-        var newIcon = document.createElement('i');
-        newIcon.classList.add('fa');
-        newIcon.classList.add(iconClass);
-        return newIcon
+        this.manipulationDiv.appendChild(this._createButton('description', 'vis-button vis-none', label));
       }
     }, {
       key: '_temporaryBindEvent',
@@ -41194,4 +41172,4 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ }
 /******/ ])
 });
-;
+;