minor tweaks

kbase · Oct 12, 2020 · 3d5272e · 3d5272e
1 parent cdde52d
commit 3d5272e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/kbase-extension/static/kbase/css/kbaseNarrative.css b/kbase-extension/static/kbase/css/kbaseNarrative.css
@@ -5,9 +5,6 @@
     font-weight: bold;
 }
 
-/* 
-    TODO: find out if it's ok to set margins this way or if we should follow design convention for positioning
-*/
 .kb-dropzone .dz-message {
     font-family: Roboto;
     font-style: normal;
@@ -3028,7 +3025,6 @@ button.kb-data-obj {
     border: none;
 }
 
-/* TODO: check with design on setting width/height (vs positioning) */
 .kb-import-content .upload-options button {
     background: #FFFFFF;
     border: 1px solid #C4C4C4;

diff --git a/kbase-extension/static/kbase/templates/data_staging/ftp_file_header.html b/kbase-extension/static/kbase/templates/data_staging/ftp_file_header.html
@@ -3,12 +3,12 @@
         <div class="upload-options">
             Other ways to upload:
             {{#if userInfo.globusLinked}}
-            <button class="globus_linked" aria-label="link to new window to upload via globus">
-                <a href="{{globusUrl}}" target="_blank" class="globus_link">Upload with Globus</a>
+            <button class="globus_linked">
+                <a href="{{globusUrl}}" target="_blank" class="globus_link" aria-label="opens new window to upload via globus">Upload with Globus</a>
             </button>
             {{else}}
-            <button class="globus_not_linked" aria-label="link to kbase globus upload docs">
-                <a href="https://docs.kbase.us/data/globus">Upload with Globus</a>
+            <button class="globus_not_linked">
+                <a href="https://docs.kbase.us/data/globus" target="_blank"  aria-label="opens new window to kbase globus upload docs">Upload with Globus</a>
             </button>
             {{/if}}
             <button class="web_upload_div">Upload with URL</button>

diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
@@ -32,7 +32,7 @@ module.exports = function (config) {
         },
         files: [
             'kbase-extension/static/narrative_paths.js',
-            {pattern: 'test/unit/spec/narrative_core/upload/*.js', included: false},
+            {pattern: 'test/unit/spec/**/*.js', included: false},
             {pattern: 'node_modules/jasmine-ajax/lib/mock-ajax.js', included: true},
             {pattern: 'kbase-extension/static/ext_components/kbase-ui-plugin-catalog/src/plugin/modules/data/categories.yml', included: false, served: true},
             {pattern: 'kbase-extension/static/**/*.css', included: false, served: true},

diff --git a/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js b/test/unit/spec/narrative_core/upload/stagingAreaViewer-spec.js
@@ -88,7 +88,7 @@ define ([
         });
 
         it('Should render properly with a Globus linked account', (done) => {
-            let $node = $('<div>'),
+            var $node = $('<div>'),
                 linkedStagingViewer = new StagingAreaViewer($node, {
                     path: startingPath,
                     updatePathFn: updatePathFn,