From b8f0a41745d53bc2f4208ec5df2d853e6eb79b2e Mon Sep 17 00:00:00 2001 From: jritchieBAE <46932687+jritchieBAE@users.noreply.github.com> Date: Thu, 7 Feb 2019 21:18:09 +0000 Subject: [PATCH] Update to Bootstrap 4.1.3 (#5192) * web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0 Signed-off-by: Andrew Chiu * web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0 Signed-off-by: Andrew Chiu * web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons Signed-off-by: Andrew Chiu * web: updated js jquery to 3.3.1 Signed-off-by: Andrew Chiu * web: updated _base.html to import new bootstrap 4.0.0, jquery3.3.1 and bootstrap class tags to be 4.0 compatible Signed-off-by: Andrew Chiu * web: _base.html missed word out in title tag (Server). Signed-off-by: Andrew Chiu * web: updated alerts.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated config.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated flags.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated service-discovery.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated status.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated targets.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu * web: alerts.css fix for button color inheritance on alerts page. Signed-off-by: Andrew Chiu * web: graph.css fix for color inheritance. Signed-off-by: Andrew Chiu * web: prometheus.css updated to fix nav bar. Signed-off-by: Andrew Chiu * web: previous merge conflict not fixed correctly on _base.html Signed-off-by: Andrew Chiu * menu.lib and prom.lib imports updated Signed-off-by: ksherryBAE * bootstrap 4.1.3 imported Signed-off-by: ksherryBAE * Bootstrap 4.1.3 imported into _base.html Signed-off-by: ksherryBAE * bootstrap 4.1.3 imported into prom.lib Signed-off-by: ksherryBAE * menu.lib style adjusted to view sidebar Signed-off-by: ksherryBAE * Alert colour uplifted to bootstrap 4.1.3 Signed-off-by: ksherryBAE * Alerts display code reformatted similarly to config Signed-off-by: ksherryBAE * Consoles pages adjusted to account for new navbar Signed-off-by: ksherryBAE * LHS Menu fixed in console pages Signed-off-by: ksherryBAE * Minor changes to prom_console to adjust lhs nav Signed-off-by: ksherryBAE * Prom.lib and some css updated to fix console graph controls Signed-off-by: ksherryBAE * Bootstrap 4.0.0 files removed Signed-off-by: ksherryBAE * Consoles configured so that the graph fits with the new side bar, css files also adjusted Signed-off-by: ksherryBAE * Import popper.min.js for dropdowns Signed-off-by: ksherryBAE * Popper.min.js imported locally Signed-off-by: ksherryBAE * Re-added #4764 and fixed css Signed-off-by: ksherryBAE * Removed .DS_Store Signed-off-by: ksherryBAE * Rebuilt assets Signed-off-by: ksherryBAE * Spaces between buttons and inputs on graph page removed Signed-off-by: ksherryBAE * fixed spacing in buttons on /targets Signed-off-by: Pritam Bhudia * Updated vfsdata.go Signed-off-by: Pritam Bhudia * fixed typeahead issue Signed-off-by: James Ritchie * added css for dropdown Signed-off-by: James Ritchie * changed order of css imports Signed-off-by: James Ritchie * tinkered with CSS changes to make keyboard select and mouseover match Signed-off-by: James Ritchie --- console_libraries/menu.lib | 44 +- console_libraries/prom.lib | 41 +- consoles/index.html.example | 2 +- consoles/prometheus-overview.html | 3 +- consoles/prometheus.html | 2 +- web/ui/assets_vfsdata.go | 503 +- web/ui/static/css/alerts.css | 1 + web/ui/static/css/graph.css | 12 +- web/ui/static/css/prom_console.css | 22 +- web/ui/static/css/prometheus.css | 6 +- .../static/js/graph/graph_template.handlebar | 62 +- .../bootstrap-3.3.1/css/bootstrap-theme.css | 470 - .../css/bootstrap-theme.css.map | 1 - .../css/bootstrap-theme.min.css | 5 - .../vendor/bootstrap-3.3.1/css/bootstrap.css | 6332 ------------ .../bootstrap-3.3.1/css/bootstrap.css.map | 1 - .../bootstrap-3.3.1/css/bootstrap.min.css | 5 - .../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 229 - .../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 0 bytes .../vendor/bootstrap-3.3.1/js/bootstrap.js | 2320 ----- .../bootstrap-3.3.1/js/bootstrap.min.js | 7 - .../static/vendor/bootstrap-3.3.1/js/npm.js | 13 - .../bootstrap-4.1.3/css/bootstrap-grid.css | 1912 ++++ .../css/bootstrap-grid.css.map | 1 + .../css/bootstrap-grid.min.css | 7 + .../css/bootstrap-grid.min.css.map | 1 + .../bootstrap-4.1.3/css/bootstrap-reboot.css | 331 + .../css/bootstrap-reboot.css.map | 1 + .../css/bootstrap-reboot.min.css | 8 + .../css/bootstrap-reboot.min.css.map | 1 + .../vendor/bootstrap-4.1.3/css/bootstrap.css | 9030 +++++++++++++++++ .../bootstrap-4.1.3/css/bootstrap.css.map | 1 + .../bootstrap-4.1.3/css/bootstrap.min.css | 7 + .../bootstrap-4.1.3/css/bootstrap.min.css.map | 1 + .../bootstrap-4.1.3/js/bootstrap.bundle.js | 6461 ++++++++++++ .../js/bootstrap.bundle.js.map | 1 + .../js/bootstrap.bundle.min.js | 7 + .../js/bootstrap.bundle.min.js.map | 1 + .../vendor/bootstrap-4.1.3/js/bootstrap.js | 3944 +++++++ .../bootstrap-4.1.3/js/bootstrap.js.map | 1 + .../bootstrap-4.1.3/js/bootstrap.min.js | 7 + .../bootstrap-4.1.3/js/bootstrap.min.js.map | 1 + .../bootstrap3-typeahead.min.js | 22 +- .../css/bootstrap-glyphicons.css | 809 ++ .../css/bootstrap-glyphicons.min.css | 6 + .../fonts/fontawesome/fa-brands-400.eot | Bin 0 -> 98620 bytes .../fonts/fontawesome/fa-brands-400.svg | 1008 ++ .../fonts/fontawesome/fa-brands-400.ttf | Bin 0 -> 98384 bytes .../fonts/fontawesome/fa-brands-400.woff | Bin 0 -> 63712 bytes .../fonts/fontawesome/fa-brands-400.woff2 | Bin 0 -> 54420 bytes .../fonts/fontawesome/fa-regular-400.eot | Bin 0 -> 31156 bytes .../fonts/fontawesome/fa-regular-400.svg | 366 + .../fonts/fontawesome/fa-regular-400.ttf | Bin 0 -> 30928 bytes .../fonts/fontawesome/fa-regular-400.woff | Bin 0 -> 14712 bytes .../fonts/fontawesome/fa-regular-400.woff2 | Bin 0 -> 12220 bytes .../fonts/fontawesome/fa-solid-900.eot | Bin 0 -> 102152 bytes .../fonts/fontawesome/fa-solid-900.svg | 1467 +++ .../fonts/fontawesome/fa-solid-900.ttf | Bin 0 -> 101932 bytes .../fonts/fontawesome/fa-solid-900.woff | Bin 0 -> 48704 bytes .../fonts/fontawesome/fa-solid-900.woff2 | Bin 0 -> 38784 bytes .../glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../glyphicons-halflings-regular.svg | 288 + .../glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../maps/glyphicons-fontawesome.css | 2947 ++++++ .../maps/glyphicons-fontawesome.less | 3891 +++++++ .../maps/glyphicons-fontawesome.min.css | 1 + web/ui/static/vendor/js/jquery-3.3.1.min.js | 2 + web/ui/static/vendor/js/popper.min.js | 5 + web/ui/templates/_base.html | 110 +- web/ui/templates/alerts.html | 8 +- web/ui/templates/config.html | 4 +- web/ui/templates/flags.html | 2 +- web/ui/templates/graph.html | 6 +- web/ui/templates/service-discovery.html | 12 +- web/ui/templates/status.html | 6 +- web/ui/templates/targets.html | 16 +- 80 files changed, 33114 insertions(+), 9667 deletions(-) delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap-theme.css delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap-theme.css.map delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap-theme.min.css delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap.css delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap.css.map delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.eot delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.svg delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.ttf delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.woff delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/js/bootstrap.js delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/js/bootstrap.min.js delete mode 100644 web/ui/static/vendor/bootstrap-3.3.1/js/npm.js create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-grid.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-grid.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-grid.min.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-grid.min.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-reboot.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-reboot.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-reboot.min.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap-reboot.min.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap.min.css create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/css/bootstrap.min.css.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.bundle.js create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.bundle.js.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.bundle.min.js create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.bundle.min.js.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.js create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.js.map create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.min.js create mode 100644 web/ui/static/vendor/bootstrap-4.1.3/js/bootstrap.min.js.map create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.css create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.eot create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.svg create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.ttf create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-brands-400.woff2 create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.eot create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.svg create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.ttf create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-regular-400.woff2 create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.eot create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.svg create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.ttf create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/fontawesome/fa-solid-900.woff2 create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.eot create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.svg create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.ttf create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/fonts/glyphicons/glyphicons-halflings-regular.woff2 create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.css create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.less create mode 100644 web/ui/static/vendor/bootstrap4-glyphicons/maps/glyphicons-fontawesome.min.css create mode 100644 web/ui/static/vendor/js/jquery-3.3.1.min.js create mode 100644 web/ui/static/vendor/js/popper.min.js diff --git a/console_libraries/menu.lib b/console_libraries/menu.lib index 929dc362a3..7ee2120c33 100644 --- a/console_libraries/menu.lib +++ b/console_libraries/menu.lib @@ -2,23 +2,24 @@ {{/* Navbar, should be passed . */}} {{ define "navbar" }} -