Commit graph

4 commits

Author SHA1 Message Date
jritchieBAE b8f0a41745 Update to Bootstrap 4.1.3 (#5192)
* web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0

Signed-off-by: Andrew Chiu <[email protected]>

* web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0

Signed-off-by: Andrew Chiu <[email protected]>

* web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated js jquery to 3.3.1

Signed-off-by: Andrew Chiu <[email protected]>

* 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 <[email protected]>

* web: _base.html missed word out in title tag (Server).

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated alerts.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated config.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated flags.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated service-discovery.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated status.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated targets.html class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible.

Signed-off-by: Andrew Chiu <[email protected]>

* web: alerts.css fix for button color inheritance on alerts page.

Signed-off-by: Andrew Chiu <[email protected]>

* web: graph.css fix for color inheritance.

Signed-off-by: Andrew Chiu <[email protected]>

* web: prometheus.css updated to fix nav bar.

Signed-off-by: Andrew Chiu <[email protected]>

* web: previous merge conflict not fixed correctly on _base.html

Signed-off-by: Andrew Chiu <[email protected]>

* menu.lib and prom.lib imports updated

Signed-off-by: ksherryBAE <[email protected]>

* bootstrap 4.1.3 imported

Signed-off-by: ksherryBAE <[email protected]>

* Bootstrap 4.1.3 imported into _base.html

Signed-off-by: ksherryBAE <[email protected]>

* bootstrap 4.1.3 imported into prom.lib

Signed-off-by: ksherryBAE <[email protected]>

* menu.lib style adjusted to view sidebar

Signed-off-by: ksherryBAE <[email protected]>

* Alert colour uplifted to bootstrap 4.1.3

Signed-off-by: ksherryBAE <[email protected]>

* Alerts display code reformatted similarly to config

Signed-off-by: ksherryBAE <[email protected]>

* Consoles pages adjusted to account for new navbar

Signed-off-by: ksherryBAE <[email protected]>

* LHS Menu fixed in console pages

Signed-off-by: ksherryBAE <[email protected]>

* Minor changes to prom_console to adjust lhs nav

Signed-off-by: ksherryBAE <[email protected]>

* Prom.lib and some css updated to fix console graph controls

Signed-off-by: ksherryBAE <[email protected]>

* Bootstrap 4.0.0 files removed

Signed-off-by: ksherryBAE <[email protected]>

* Consoles configured so that the graph fits with the new side bar, css files also adjusted

Signed-off-by: ksherryBAE <[email protected]>

* Import popper.min.js for dropdowns

Signed-off-by: ksherryBAE <[email protected]>

* Popper.min.js imported locally

Signed-off-by: ksherryBAE <[email protected]>

* Re-added #4764 and fixed css

Signed-off-by: ksherryBAE <[email protected]>

* Removed .DS_Store

Signed-off-by: ksherryBAE <[email protected]>

* Rebuilt assets

Signed-off-by: ksherryBAE <[email protected]>

* Spaces between buttons and inputs on graph page removed

Signed-off-by: ksherryBAE <[email protected]>

* fixed spacing in buttons on /targets

Signed-off-by: Pritam Bhudia <[email protected]>

* Updated vfsdata.go

Signed-off-by: Pritam Bhudia <[email protected]>

* fixed typeahead issue

Signed-off-by: James Ritchie <[email protected]>

* added css for dropdown

Signed-off-by: James Ritchie <[email protected]>

* changed order of css imports

Signed-off-by: James Ritchie <[email protected]>

* tinkered with CSS changes to make keyboard select and mouseover match

Signed-off-by: James Ritchie <[email protected]>
2019-02-07 22:18:09 +01:00
James Turnbull 4486ef013b Make show annotations checkbox match query history checkbox (#3936)
After removing the checkbox in #3913 the only remaining element that
looked like it was the new Show Annotations checkbox on the Alerts page.
Which in turn didn't look like the Enable query history checkout on the
graph page. So:

1. This takes the Enable query history button as canonical.
2. Updates the show annotations button code to match it.
3. Simplifies the JS for the checkbox.
2018-03-09 14:39:28 +01:00
Julien Pivotto 155faab7a2 Display annotations on Alerts page (#3900)
Fixes #1219

Signed-off-by: Julien Pivotto <[email protected]>
2018-03-01 15:26:36 +00:00
Fabian Reinartz 57ca7108aa Enable debug generation of go-bindata, rename blob/ to ui/ 2015-11-11 15:55:16 +01:00
Renamed from web/blob/static/css/alerts.css (Browse further)