Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

data-search, dataview updates #658

Merged
merged 3 commits into from
May 2, 2018
Merged

data-search, dataview updates #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ad10c3
data-search: updated docs
eapearson May 2, 2018
3d0dc19
bower dependency update
eapearson May 2, 2018
6163563
clean up kbase icon styles
eapearson May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 60 additions & 58 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

11 changes: 9 additions & 2 deletions config/app/dev/plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand All @@ -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
# -
Expand Down Expand Up @@ -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: {}
Expand Down
4 changes: 2 additions & 2 deletions config/app/prod/plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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: {}
Expand Down
12 changes: 12 additions & 0 deletions config/bowerInstall.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions src/client/modules/app/styles/kb-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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 {
Expand Down