diff --git a/.gitignore b/.gitignore index 4dad45d17..4abf770be 100755 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,10 @@ dist/ /blast/static/blast/css/colReorder.dataTables.css /blast/static/blast/css/dataTables.bootstrap.css /blast/static/blast/css/jquery.dataTables.css +/blast/static/blast/css/images/ui-icons_* +/blast/static/blast/css/images/ui-bg_g* +/blast/static/blast/css/images/ui-bg_h* +/blast/static/blast/css/images/ui-bg_d* /hmmer/static/hmmer/scripts/jquery.hoverIntent.js /hmmer/static/hmmer/scripts/jquery.validate.js diff --git a/blast/static/blast/css/Bootstrap/editor.png b/blast/static/blast/css/Bootstrap/editor.png new file mode 100644 index 000000000..456f9c518 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/editor.png differ diff --git a/blast/static/blast/css/Bootstrap/imagebrowser.png b/blast/static/blast/css/Bootstrap/imagebrowser.png new file mode 100644 index 000000000..210cf4950 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/imagebrowser.png differ diff --git a/blast/static/blast/css/Bootstrap/indeterminate.gif b/blast/static/blast/css/Bootstrap/indeterminate.gif new file mode 100644 index 000000000..34f4609c1 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/indeterminate.gif differ diff --git a/blast/static/blast/css/Bootstrap/loading-image.gif b/blast/static/blast/css/Bootstrap/loading-image.gif new file mode 100644 index 000000000..8a6503fc8 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/loading-image.gif differ diff --git a/blast/static/blast/css/Bootstrap/loading.gif b/blast/static/blast/css/Bootstrap/loading.gif new file mode 100644 index 000000000..86e6ad705 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/loading.gif differ diff --git a/blast/static/blast/css/Bootstrap/loading_2x.gif b/blast/static/blast/css/Bootstrap/loading_2x.gif new file mode 100644 index 000000000..4e37faa3e Binary files /dev/null and b/blast/static/blast/css/Bootstrap/loading_2x.gif differ diff --git a/blast/static/blast/css/Bootstrap/markers.png b/blast/static/blast/css/Bootstrap/markers.png new file mode 100644 index 000000000..1747607da Binary files /dev/null and b/blast/static/blast/css/Bootstrap/markers.png differ diff --git a/blast/static/blast/css/Bootstrap/markers_2x.png b/blast/static/blast/css/Bootstrap/markers_2x.png new file mode 100644 index 000000000..28c0c62e7 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/markers_2x.png differ diff --git a/blast/static/blast/css/Bootstrap/slider-h.gif b/blast/static/blast/css/Bootstrap/slider-h.gif new file mode 100644 index 000000000..188e80ed5 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/slider-h.gif differ diff --git a/blast/static/blast/css/Bootstrap/slider-v.gif b/blast/static/blast/css/Bootstrap/slider-v.gif new file mode 100644 index 000000000..d5c2e215c Binary files /dev/null and b/blast/static/blast/css/Bootstrap/slider-v.gif differ diff --git a/blast/static/blast/css/Bootstrap/sprite.png b/blast/static/blast/css/Bootstrap/sprite.png new file mode 100644 index 000000000..9c130e1aa Binary files /dev/null and b/blast/static/blast/css/Bootstrap/sprite.png differ diff --git a/blast/static/blast/css/Bootstrap/sprite_2x.png b/blast/static/blast/css/Bootstrap/sprite_2x.png new file mode 100644 index 000000000..edfaba331 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/sprite_2x.png differ diff --git a/blast/static/blast/css/Bootstrap/sprite_kpi.png b/blast/static/blast/css/Bootstrap/sprite_kpi.png new file mode 100644 index 000000000..8b15ccdaa Binary files /dev/null and b/blast/static/blast/css/Bootstrap/sprite_kpi.png differ diff --git a/blast/static/blast/css/Bootstrap/sprite_kpi_2x.png b/blast/static/blast/css/Bootstrap/sprite_kpi_2x.png new file mode 100644 index 000000000..89bfe3729 Binary files /dev/null and b/blast/static/blast/css/Bootstrap/sprite_kpi_2x.png differ diff --git a/blast/static/blast/css/blast-results.css b/blast/static/blast/css/blast-results.css index 58aed88e2..106d57793 100755 --- a/blast/static/blast/css/blast-results.css +++ b/blast/static/blast/css/blast-results.css @@ -3,13 +3,13 @@ top: 0; width: 12px; border-width: 0; - background: #efefef url('images/handle.svg') no-repeat center; + background: #efefef; } .k-ghost-splitbar-vertical, .k-splitbar-vertical { left: 0; height: 12px; border-width: 0; - background: #efefef url('images/handle-h.svg') no-repeat center; + background: #efefef; } .k-splitbar:hover { background-color: #ddd; diff --git a/blast/static/blast/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/blast/static/blast/css/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 000000000..a2e6bfc08 Binary files /dev/null and b/blast/static/blast/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/blast/static/blast/css/images/unchecked.gif b/blast/static/blast/css/images/unchecked.gif new file mode 100644 index 000000000..5d5b85f4a Binary files /dev/null and b/blast/static/blast/css/images/unchecked.gif differ diff --git a/blast/static/blast/css/jquery-ui-custom.css b/blast/static/blast/css/jquery-ui-custom.css index 63fa3be72..af8c8292f 100755 --- a/blast/static/blast/css/jquery-ui-custom.css +++ b/blast/static/blast/css/jquery-ui-custom.css @@ -630,7 +630,7 @@ .ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; - background: #000000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x; + background: #000000; opacity: .2; filter: Alpha(Opacity=20); /* support: IE8 */ border-radius: 5px; diff --git a/filebrowser/static/filebrowser/img/glyphicons-halflings.png b/filebrowser/static/filebrowser/img/glyphicons-halflings.png new file mode 100644 index 000000000..f43139a48 Binary files /dev/null and b/filebrowser/static/filebrowser/img/glyphicons-halflings.png differ diff --git a/package-lock.json b/package-lock.json index d50618c5f..93234392a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2678,11 +2678,21 @@ } } }, + "jquery-ui": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", + "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" + }, "jquery-ui-dist": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.0.tgz", "integrity": "sha1-Cpnq8uNBDez4AoGV6QwblroMeRI=" }, + "jquery-ui-themes": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/jquery-ui-themes/-/jquery-ui-themes-1.12.0.tgz", + "integrity": "sha1-pXugrZaADYRSL+dok//L3mcIHVE=" + }, "jquery-validation": { "version": "1.14.0", "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.14.0.tgz", diff --git a/package.json b/package.json index 381a82ea6..1b4515126 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "jquery": "^1.11.1", "jquery-hoverintent": "^1.9.0", "jquery-ui-dist": "^1.12.0", + "jquery-ui-themes": "^1.12.0", "jquery-validation": "^1.14.0", "jquery.dragscrollable": "^1.0.0", "marked": "^0.3.19", diff --git a/webpack.config.js b/webpack.config.js index 62f0a8ab6..dd518dff9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -38,6 +38,7 @@ const appScriptConfig = { const blastScripts = path.resolve(__dirname, 'blast/static/blast/scripts'); const blastStyles = path.resolve(__dirname, 'blast/static/blast/css'); +const blastImages = path.resolve(__dirname, 'blast/static/blast/css/images'); const blastScriptConfig = { entry: path.join(nodeModules, '/jquery-validation/dist/jquery.validate.js'), // Just a fake entry, we only copy files here output: { @@ -66,6 +67,25 @@ const blastScriptConfig = { { from: path.join(nodeModules, '/datatables.net-colreorder-dt/css/colReorder.dataTables.css'), to: blastStyles}, { from: path.join(nodeModules, '/datatables.net-bs/css/dataTables.bootstrap.css'), to: blastStyles}, { from: path.join(nodeModules, '/datatables.net-dt/css/jquery.dataTables.css'), to: blastStyles}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_444444_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_777620_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_cc0000_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_555555_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_777777_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-dist/images/ui-icons_ffffff_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-icons_222222_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-icons_228ef1_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-icons_ef8c08_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-icons_ffd27a_256x240.png'), to: blastImages}, + { from: path.join(nodeModules, '/jquery-ui-themes/themes/ui-lightness/images/ui-icons_ffffff_256x240.png'), to: blastImages}, ]) ], module: {