Multiple Changes:

*Bug fixes on resize if on data import view. (refs #130) *General styling fixes. (refs #19)
VALIDproject · Jan 25, 2018 · a89ff49 · a89ff49
1 parent 56c082d
commit a89ff49
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -143,7 +143,9 @@ export class App implements MAppViews {
     $(window).resize(function () {
       clearTimeout(id);
       id = setTimeout(function () {
-        events.fire(AppConstants.EVENT_RESIZE_WINDOW);
+        if(!$('.dataVizView').hasClass('invisibleClass')) {
+          events.fire(AppConstants.EVENT_RESIZE_WINDOW);
+        }
       }, 300);
     });
   }

diff --git a/src/data_import.ts b/src/data_import.ts
@@ -79,7 +79,7 @@ class DataImport implements MAppViews {
           <div class='input-group'>
               <span class='input-group-btn' style='padding-right: 2px;'>
                 <span class='btn btn-default btn-file'>
-                  Load CSV file... 
+                  Select CSV file... 
                   <input type='file' id='files' accept='.csv' required />
                 </span>
               </span>
@@ -97,10 +97,10 @@ class DataImport implements MAppViews {
     // Add the display conatiner and the logs
     d3.select('.fileContainer').append('div').classed('additionalInfo', true);
     this.$displayContainer = d3.select('.additionalInfo').html(`
-        <div class='logContainer'>
-          <div id='errorLog'></div>
-          <div id='messageLog'></div>
-        </div>
+        <!--<div class='logContainer'>-->
+          <!--<div id='errorLog'></div>-->
+          <!--<div id='messageLog'></div>-->
+        <!--</div>-->
         <div class='row'>
           <div class='ctrlContainer'>
             <h3 id='valueListName'></h3>
@@ -159,11 +159,11 @@ class DataImport implements MAppViews {
    * Attach the event listeners
    */
   private attachListener() {
-    //Listener for the upload button
+    // Listener for the upload button
     this.$node.select('#submitFile')
       .on('click', (e) => {
         SimpleLogging.log('import submit button','');
-        //Clear the log first
+        // Clear the log first
         d3.select('#errorLog').selectAll('*').remove();
         d3.select('#messageLog').html('');
 

diff --git a/src/sankey_diagram.ts b/src/sankey_diagram.ts
@@ -252,7 +252,6 @@ class SankeyDiagram implements MAppViews {
 
     // Listen for resize of the window
     events.on(AppConstants.EVENT_RESIZE_WINDOW, () => {
-      console.log('!!!!: ', AppConstants.EVENT_RESIZE_WINDOW);
       SimpleLogging.log('resize window', '');
       this.resize();
     });

diff --git a/src/styles/_data_imports.scss b/src/styles/_data_imports.scss
@@ -116,6 +116,21 @@
 .btn-file {
   position: relative;
   overflow: hidden;
+  background:
+  /* On "top" */
+  repeating-linear-gradient(
+    45deg,
+    transparent,
+    transparent 10px,
+    #fbfbfb 10px,
+    #fbfbfb 20px
+  ),
+  /* on "bottom" */
+  linear-gradient(
+    to bottom,
+    #fbfbfb,
+    #dfdfdf
+  );
 }
 
 .btn-file input[type=file] {