diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-05-19 12:33:38 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-05-19 12:33:59 +0000 |
commit | 1ee0c09c5742557e037df5421ca62abddb90ae22 (patch) | |
tree | 71c0fa48bb6d31d036c9badd7e038527f90d1a73 /web/gui/css | |
parent | Releasing debian version 1.30.1-1. (diff) | |
download | netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.tar.xz netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.zip |
Merging upstream version 1.31.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | web/gui/dashboard/css/bootstrap-3.3.7.css (renamed from web/gui/css/bootstrap-3.3.7.css) | 12 | ||||
-rw-r--r-- | web/gui/dashboard/css/bootstrap-slate-flat-3.3.7.css (renamed from web/gui/css/bootstrap-slate-flat-3.3.7.css) | 0 | ||||
-rw-r--r-- | web/gui/dashboard/css/bootstrap-slider-10.0.0.min.css (renamed from web/gui/css/bootstrap-slider-10.0.0.min.css) | 0 | ||||
-rw-r--r-- | web/gui/dashboard/css/bootstrap-theme-3.3.7.min.css (renamed from web/gui/css/bootstrap-theme-3.3.7.min.css) | 0 | ||||
-rw-r--r-- | web/gui/dashboard/css/bootstrap-toggle-2.2.2.min.css (renamed from web/gui/css/bootstrap-toggle-2.2.2.min.css) | 0 |
5 files changed, 7 insertions, 5 deletions
diff --git a/web/gui/css/bootstrap-3.3.7.css b/web/gui/dashboard/css/bootstrap-3.3.7.css index 8c4db1f33..55fa2acba 100644 --- a/web/gui/css/bootstrap-3.3.7.css +++ b/web/gui/dashboard/css/bootstrap-3.3.7.css @@ -265,7 +265,9 @@ th { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + /* removed svg font, because 1) it's incompatible with current cloud webpack loaders */ + /* 2) our supported browsers don't need svg anyway */ + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'); } .glyphicon { position: relative; @@ -1086,8 +1088,8 @@ body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; - color: #333; - background-color: #fff; + color: var(--color-text, #333); + background-color: var(--color-mainBackground, #fff); } input, button, @@ -1134,8 +1136,8 @@ img { height: auto; padding: 4px; line-height: 1.42857143; - background-color: #fff; - border: 1px solid #ddd; + background-color: var(--color-mainBackground, #fff); + border: 1px solid var(--color-border, #ddd); border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; diff --git a/web/gui/css/bootstrap-slate-flat-3.3.7.css b/web/gui/dashboard/css/bootstrap-slate-flat-3.3.7.css index 7ce384f81..7ce384f81 100644 --- a/web/gui/css/bootstrap-slate-flat-3.3.7.css +++ b/web/gui/dashboard/css/bootstrap-slate-flat-3.3.7.css diff --git a/web/gui/css/bootstrap-slider-10.0.0.min.css b/web/gui/dashboard/css/bootstrap-slider-10.0.0.min.css index 095be9514..095be9514 100644 --- a/web/gui/css/bootstrap-slider-10.0.0.min.css +++ b/web/gui/dashboard/css/bootstrap-slider-10.0.0.min.css diff --git a/web/gui/css/bootstrap-theme-3.3.7.min.css b/web/gui/dashboard/css/bootstrap-theme-3.3.7.min.css index ba77cff5d..ba77cff5d 100644 --- a/web/gui/css/bootstrap-theme-3.3.7.min.css +++ b/web/gui/dashboard/css/bootstrap-theme-3.3.7.min.css diff --git a/web/gui/css/bootstrap-toggle-2.2.2.min.css b/web/gui/dashboard/css/bootstrap-toggle-2.2.2.min.css index a3daa3721..a3daa3721 100644 --- a/web/gui/css/bootstrap-toggle-2.2.2.min.css +++ b/web/gui/dashboard/css/bootstrap-toggle-2.2.2.min.css |