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

Update to Bootstrap 4.1.3 #5192

Merged
merged 42 commits into from Feb 7, 2019
Merged

Update to Bootstrap 4.1.3 #5192

merged 42 commits into from Feb 7, 2019

Conversation

jritchieBAE
Copy link
Contributor

This is an updated pull request as discussed in issue #4821 and has been rebased against the current Prometheus master.

achiuBAE and others added 30 commits February 7, 2019 15:17
@achiuBAE @jritchieBAE
web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0
8829050 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0
7ff6d1d 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 g…
156be4b 
…lyphicons

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated js jquery to 3.3.1
791dd8d 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated _base.html to import new bootstrap 4.0.0, jquery3.3.1 an…
d452637 
…d bootstrap class tags to be 4.0 compatible

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: _base.html missed word out in title tag (Server).
b3aba7b 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated alerts.html class names and tags to be bootstrap 4 compa…
ac3431e 
…tible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated config.html class names and tags to be bootstrap 4 compa…
3986599 
…tible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated flags.html class names and tags to be bootstrap 4 compat…
50f8c1b 
…ible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated service-discovery.html class names and tags to be bootst…
aff9f4a 
…rap 4 compatible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated status.html class names and tags to be bootstrap 4 compa…
781e560 
…tible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated targets.html class names and tags to be bootstrap 4 comp…
bdcadc8 
…atible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: updated graph_template.handlebar class names and tags to be boot…
8a9bf7c 
…strap 4 compatible.

Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: alerts.css fix for button color inheritance on alerts page.
edc3aa0 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: graph.css fix for color inheritance.
9813f19 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: prometheus.css updated to fix nav bar.
b12baf1 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@achiuBAE @jritchieBAE
web: previous merge conflict not fixed correctly on _base.html
b44d275 
Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com>
@ksherryBAE @jritchieBAE
menu.lib and prom.lib imports updated
9d15dcb 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
bootstrap 4.1.3 imported
3cdc4ea 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Bootstrap 4.1.3 imported into _base.html
825df82 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
bootstrap 4.1.3 imported into prom.lib
7c3d358 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
menu.lib style adjusted to view sidebar
78b3da4 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Alert colour uplifted to bootstrap 4.1.3
f51cda5 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Alerts display code reformatted similarly to config
37919db 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Consoles pages adjusted to account for new navbar
2304e73 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
LHS Menu fixed in console pages
6f50b25 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Minor changes to prom_console to adjust lhs nav
713f1ee 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Prom.lib and some css updated to fix console graph controls
eaec039 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Bootstrap 4.0.0 files removed
0f27a84 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Consoles configured so that the graph fits with the new side bar, css…
ddea24a 
… files also adjusted

Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
ksherryBAE and others added 12 commits February 7, 2019 15:28
@ksherryBAE @jritchieBAE
Import popper.min.js for dropdowns
ec4ffb5 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Popper.min.js imported locally
34140a6 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Re-added #4764 and fixed css
533be4c 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Removed .DS_Store
817c4cf 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Rebuilt assets
7558266 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@ksherryBAE @jritchieBAE
Spaces between buttons and inputs on graph page removed
08618f0 
Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com>
@pbhudiaBAE @jritchieBAE
fixed spacing in buttons on /targets
6b42c96 
Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com>
@pbhudiaBAE @jritchieBAE
Updated vfsdata.go
abd4f95 
Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com>
@jritchieBAE
fixed typeahead issue
a65d6b9 
Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
@jritchieBAE
added css for dropdown
6faa11a 
Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
@jritchieBAE
changed order of css imports
b63975e 
Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
@jritchieBAE
tinkered with CSS changes to make keyboard select and mouseover match
0977254 
Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>
@jritchieBAE jritchieBAE changed the base branch from master to bootstrap4 February 7, 2019 16:37
@juliusv
Copy link
Member

juliusv commented Feb 7, 2019

Thanks, I'll merge this here into the bootstrap4 branch and then we can both work on fixing some final bits (in case you do manage to figure out the focus issue from #4821 (comment), let me know).

@juliusv juliusv merged commit b8f0a41 into prometheus:bootstrap4 Feb 7, 2019
@jritchieBAE jritchieBAE mentioned this pull request Feb 8, 2019
Closed
@juliusv juliusv mentioned this pull request Feb 17, 2019
Merged
@simonpasquier simonpasquier mentioned this pull request Mar 26, 2019
Merged
simonpasquier added a commit to simonpasquier/prometheus that referenced this pull request Mar 26, 2019
@simonpasquier
web/ui: display the job label in /targets
7328cb6 
PR prometheus#4806 was removed accidentally by prometheus#5192 (Bootstrap upgrade).

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jritchieBAE @juliusv @achiuBAE @ksherryBAE @pbhudiaBAE