From dd7ffe0515f20fc8dbfbbece5e22727a57631a79 Mon Sep 17 00:00:00 2001 From: Max Leonard Inden Date: Wed, 7 Jun 2017 15:50:44 +0200 Subject: [PATCH] Serve FontAwesome & Bootstrap ourself Instead of using external CDNs for Bootstrap and FontAwesome, this patch makes Alertmanager serve these libraries itself. --- Makefile | 7 +- ui/app/index.html | 2 - ui/app/src/Main.elm | 10 +- ui/app/src/Types.elm | 3 + ui/app/src/Updates.elm | 3 + ui/app/src/Views.elm | 53 +- ui/bindata.go | 250 +- .../css/bootstrap.min.css | 6 + .../css/bootstrap.min.css.map | 1 + .../font-awesome-4.7.0/css/font-awesome.css | 2337 ++++++++++++++ .../css/font-awesome.min.css | 4 + .../font-awesome-4.7.0/fonts/FontAwesome.otf | Bin 0 -> 134808 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../fonts/fontawesome-webfont.svg | 2671 +++++++++++++++++ .../fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes ui/web.go | 8 + 18 files changed, 5324 insertions(+), 31 deletions(-) create mode 100644 ui/lib/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css create mode 100644 ui/lib/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map create mode 100644 ui/lib/font-awesome-4.7.0/css/font-awesome.css create mode 100644 ui/lib/font-awesome-4.7.0/css/font-awesome.min.css create mode 100644 ui/lib/font-awesome-4.7.0/fonts/FontAwesome.otf create mode 100644 ui/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.eot create mode 100644 ui/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.svg create mode 100644 ui/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf create mode 100644 ui/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff create mode 100644 ui/lib/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 diff --git a/Makefile b/Makefile index 68c763e2..4103fb3f 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,12 @@ assets: -@$(GO) get -u github.com/jteeuwen/go-bindata/... # Using "-mode 420" and "-modtime 1" to make assets make target deterministic. # It sets all file permissions and time stamps to 420 and 1 - @go-bindata $(bindata_flags) -mode 420 -modtime 1 -pkg ui -o ui/bindata.go ui/app/script.js ui/app/index.html ui/app/favicon.ico + @go-bindata $(bindata_flags) -mode 420 -modtime 1 -pkg ui -o \ + ui/bindata.go ui/app/script.js \ + ui/app/index.html \ + ui/app/favicon.ico \ + ui/lib/... + @go-bindata $(bindata_flags) -mode 420 -modtime 1 -pkg deftmpl -o template/internal/deftmpl/bindata.go template/default.tmpl promu: diff --git a/ui/app/index.html b/ui/app/index.html index 72be7118..4366b302 100644 --- a/ui/app/index.html +++ b/ui/app/index.html @@ -4,8 +4,6 @@ Alertmanager - -