From 8ad10c34782c0f76c57e7d155196cdc7480ada7a Mon Sep 17 00:00:00 2001 From: Erik Pearson Date: Wed, 2 May 2018 12:18:27 -0700 Subject: [PATCH 1/3] data-search: updated docs --- config/app/dev/plugins.yml | 11 +++++++++-- config/app/prod/plugins.yml | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/app/dev/plugins.yml b/config/app/dev/plugins.yml index 56e1633f0..3fcee5f34 100644 --- a/config/app/dev/plugins.yml +++ b/config/app/dev/plugins.yml @@ -33,7 +33,7 @@ plugins: - name: dataview globalName: kbase-ui-plugin-dataview - version: 3.7.2 + version: 3.7.3 cwd: src/plugin source: bower: {} @@ -44,6 +44,13 @@ plugins: cwd: src/plugin source: bower: {} + # - + # name: dashboard2 + # globalName: kbase-ui-plugin-dashboard2 + # version: 0.1.0 + # cwd: src/plugin + # source: + # bower: {} # These are just developer # - @@ -231,7 +238,7 @@ plugins: - name: data-search globalName: kbase-ui-plugin-data-search - version: 0.15.1 + version: 0.15.2 cwd: src/plugin source: bower: {} diff --git a/config/app/prod/plugins.yml b/config/app/prod/plugins.yml index 1b08b20b6..5a373a363 100644 --- a/config/app/prod/plugins.yml +++ b/config/app/prod/plugins.yml @@ -33,7 +33,7 @@ plugins: - name: dataview globalName: kbase-ui-plugin-dataview - version: 3.7.2 + version: 3.7.3 cwd: src/plugin source: bower: {} @@ -209,7 +209,7 @@ plugins: - name: data-search globalName: kbase-ui-plugin-data-search - version: 0.15.1 + version: 0.15.2 cwd: src/plugin source: bower: {} From 3d0dc1952ea5bf57dd22f3925b33b1934fa22b9f Mon Sep 17 00:00:00 2001 From: Erik Pearson Date: Wed, 2 May 2018 12:19:39 -0700 Subject: [PATCH 2/3] bower dependency update - several third party updates - new kbase: es6 lib, knockout extensions --- bower.json | 118 ++++++++++++++++++++-------------------- config/bowerInstall.yml | 12 ++++ 2 files changed, 72 insertions(+), 58 deletions(-) diff --git a/bower.json b/bower.json index 8da443a5d..3a62dda3c 100644 --- a/bower.json +++ b/bower.json @@ -2,75 +2,77 @@ "name": "kbase-ui", "description": "The KBase User Interface", "keywords": [ - "kbase", - "ui" + "kbase", + "ui" ], "author": [ - "kbase" + "kbase" ], "moduleType": "amd-application", "main": "src/client/index.html", "ignore": [], "repository": { - "type": "git", - "url": "git://github.com/kbase/kbase-ui" + "type": "git", + "url": "git://github.com/kbase/kbase-ui" }, "dependencies": { - "ajv": "6.2.0", - "blockui": "2.70", - "bluebird": "3.5.1", - "bootstrap": "3.3.7", - "bower-knockout-mapping": "2.6.0", - "comma-separated-values": "3.6.4", - "d3": "3.5.17", - "d3-plugins-sankey": "1.1.0", - "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1", - "datatables": "1.10.16", - "file-saver": "1.3.4", - "font-awesome": "4.7.0", - "google-code-prettify": "1.0.5", - "handlebars": "4.0.11", - "highlightjs": "9.10.0", - "jquery": "2.2.4", - "jquery-ui": "1.12.1", - "js-yaml": "3.10.0", - "kbase-ko-components-js": "0.5.2", - "kbase-common-ts": "0.18.0", - "kbase-common-js": "2.16.0", - "kbase-sdk-clients-js": "0.5.1", - "kbase-service-clients-js": "3.3.5", - "kbase-ui-widget": "1.2.1", - "knockout-arraytransforms": "2.1.1", - "knockout-switch-case": "2.1.0", - "knockout-validation": "2.0.3", - "knockout": "3.5.0-beta", - "marked": "0.3.12", - "moment": "2.20.1", - "numeral": "2.0.4", - "nunjucks": "3.0.0", - "plotly.js": "1.33.1", - "pure-uuid": "eapearson/pure-uuid#1.1.1", - "regression-js": "1.4.0", - "require-css": "0.1.10", - "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5", - "requirejs-domready": "2.0.1", - "requirejs-json": "0.0.3", - "requirejs-text": "2.0.15", - "requirejs": "eapearson/requirejs#3.0.0-alpha5", - "select2": "4.0.5", - "select2-bootstrap-theme": "0.1.0-beta.10", - "spark-md5": "3.0.0", - "underscore": "1.8.3" + "blockui": "2.70", + "bluebird": "3.5.1", + "bootstrap": "3.3.7", + "bower-knockout-mapping": "2.6.0", + "comma-separated-values": "3.6.4", + "d3": "3.5.17", + "d3-plugins-sankey": "1.1.0", + "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1", + "datatables": "1.10.16", + "file-saver": "1.3.4", + "font-awesome": "4.7.0", + "google-code-prettify": "1.0.5", + "handlebars": "4.0.11", + "highlightjs": "9.12.0", + "jquery": "2.2.4", + "jquery-ui": "1.12.1", + "js-yaml": "3.11.0", + "kbase-ko-components-js": "0.5.3", + "kbase-knockout-extensions-es6": "0.1.1", + "kbase-common-ts": "0.18.0", + "kbase-common-js": "2.16.0", + "kbase-common-es6": "0.1.0", + "kbase-sdk-clients-js": "0.5.1", + "kbase-service-clients-js": "3.3.5", + "kbase-ui-widget": "1.3.0", + "knockout-arraytransforms": "2.1.1", + "knockout-switch-case": "2.1.0", + "knockout-validation": "2.0.3", + "knockout": "3.5.0-rc", + "marked": "0.3.19", + "moment": "2.22.1", + "numeral": "2.0.6", + "nunjucks": "3.0.0", + "plotly.js": "1.33.1", + "pure-uuid": "eapearson/pure-uuid#1.1.1", + "regression-js": "1.4.0", + "require-css": "0.1.10", + "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5", + "requirejs-domready": "2.0.1", + "requirejs-json": "0.0.3", + "requirejs-text": "2.0.15", + "requirejs": "eapearson/requirejs#3.0.0-alpha5", + "select2": "4.0.5", + "select2-bootstrap-theme": "0.1.0-beta.10", + "spark-md5": "3.0.0", + "underscore": "1.8.3" }, "resolutions": { - "font-awesome": "4.7.0", - "datatables-bootstrap3-plugin": "1.0.1", - "numeral": "2.0.4", - "nunjucks": "3.0.0", - "kbase-common-js": "^2.5.0", - "kbase-service-clients-js": "^3.0.0", - "requirejs": "3.0.0-alpha5" + "font-awesome": "4.7.0", + "datatables-bootstrap3-plugin": "1.0.1", + "numeral": "2.0.6", + "nunjucks": "3.0.0", + "kbase-common-js": "^2.5.0", + "kbase-service-clients-js": "^3.0.0", + "requirejs": "3.0.0-alpha5" }, "devDependencies": {}, "license": "SEE LICENSE IN LICENSE" -} + } + \ No newline at end of file diff --git a/config/bowerInstall.yml b/config/bowerInstall.yml index c73e62efd..bcfffddaa 100644 --- a/config/bowerInstall.yml +++ b/config/bowerInstall.yml @@ -203,12 +203,24 @@ bowerFiles: cwd: dist/kb_common src: "**/*" bowerComponent: false + - + name: kb_lib + dir: kbase-common-es6 + cwd: src + src: '**/*' + bowerComponent: false - name: kb_ko dir: kbase-ko-components-js cwd: src src: "**/*" bowerComponent: false + - + name: kb_knockout + dir: kbase-knockout-extensions-es6 + cwd: src + src: "**/*" + bowerComponent: false - name: kb_service dir: kbase-service-clients-js From 6163563ea9586eef5fc2409f1dbc875b230d473d Mon Sep 17 00:00:00 2001 From: Erik Pearson Date: Wed, 2 May 2018 12:20:24 -0700 Subject: [PATCH 3/3] clean up kbase icon styles --- src/client/modules/app/styles/kb-icons.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/client/modules/app/styles/kb-icons.css b/src/client/modules/app/styles/kb-icons.css index 8bc98b44a..ae48d9350 100644 --- a/src/client/modules/app/styles/kb-icons.css +++ b/src/client/modules/app/styles/kb-icons.css @@ -31,7 +31,6 @@ text-transform: none !important; vertical-align: top; speak: none; - /* line-height: 0.8; */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -43,32 +42,26 @@ .icon-compare:before { content: "a"; - /* font-size: 16px; */ } .icon-genome:before { content: "b"; - /* font-size: 16px; */ } .icon-metabolism:before { content: "c"; - /* font-size: 16px; */ } .icon-metagenome:before { content: "d"; - /* font-size: 16px; */ } .icon-reads:before { content: "e"; - /* font-size: 16px; */ } .icon-tree:before { content: "f"; - /* font-size: 16px; */ } .icon-md:before {