Update to Bootstrap 4 #5226
Merged
Update to Bootstrap 4 #5226
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated js jquery to 3.3.1 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * 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 <andrew.chiu2@baesystems.com> * web: _base.html missed word out in title tag (Server). Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated alerts.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated config.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated flags.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated service-discovery.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated status.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated targets.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: alerts.css fix for button color inheritance on alerts page. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: graph.css fix for color inheritance. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: prometheus.css updated to fix nav bar. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: previous merge conflict not fixed correctly on _base.html Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * menu.lib and prom.lib imports updated Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.1.3 imported into _base.html Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported into prom.lib Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * menu.lib style adjusted to view sidebar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alert colour uplifted to bootstrap 4.1.3 Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alerts display code reformatted similarly to config Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles pages adjusted to account for new navbar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * LHS Menu fixed in console pages Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Minor changes to prom_console to adjust lhs nav Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Prom.lib and some css updated to fix console graph controls Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.0.0 files removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles configured so that the graph fits with the new side bar, css files also adjusted Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Import popper.min.js for dropdowns Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Popper.min.js imported locally Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Re-added #4764 and fixed css Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Removed .DS_Store Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Rebuilt assets Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Spaces between buttons and inputs on graph page removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * fixed spacing in buttons on /targets Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Updated vfsdata.go Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * fixed typeahead issue Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * added css for dropdown Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * changed order of css imports Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * tinkered with CSS changes to make keyboard select and mouseover match Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
|
Hmm, the failing DCO check is because of:
That originated from squashing the original PR into the |
juliusv
commented
Feb 17, 2019
| @@ -1,21 +1 @@ | |||
| /* ============================================================= | |||
| * bootstrap3-typeahead.js v3.1.0 | |||
There was a problem hiding this comment.
@jritchieBAE I notice that the typeahead's license header and info got removed in #5192. I think we probably want to keep (re-add) that, so I added another commit to add the latest license header from https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js.
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julius Volz <julius.volz@gmail.com>
This was referenced Feb 20, 2019
This was referenced Apr 4, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@jritchieBAE This is the PR to merge your Bootstrap 4 conversion into master. Most of the changes are from you / BAE, but I added some fix commits on top of that. The /graph page still doesn't look ideal, but neither did it before and also I plan to replace it completely, so I didn't spend more energy on adjusting that.