From c5d4c5395d0864f18139379847fc0fb26dfd6d91 Mon Sep 17 00:00:00 2001 From: Alexander Moisseev Date: Sat, 24 Dec 2016 15:23:40 +0300 Subject: [PATCH] [WebUI] Replace spinner with animated glyphicon --- interface/css/rspamd.css | 41 ++++++++++++-------------------------- interface/img/spinner.gif | Bin 1690 -> 0 bytes interface/img/spinner.png | Bin 1160 -> 0 bytes interface/index.html | 4 ++-- interface/js/rspamd.js | 4 +++- 5 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 interface/img/spinner.gif delete mode 100644 interface/img/spinner.png diff --git a/interface/css/rspamd.css b/interface/css/rspamd.css index 7a2f4b9209..ca0ca815e5 100644 --- a/interface/css/rspamd.css +++ b/interface/css/rspamd.css @@ -91,28 +91,6 @@ textarea { font-size:11px !important; } -/* spinners optional */ -input { - margin:0px; - padding:0px; - width:60px; - } -input[type=number] { - padding-right:25px; /* at least image width */ - text-align:right; - width:60px; - } -input.number { /* should be same as type=number for IE and overriding */ - padding-right:25px; /* at least image width */ - text-align:right; - } -input::-webkit-outer-spin-button, -input::-webkit-inner-spin-button { - /* display:none; <- Crashes Chrome on hover */ - -webkit-appearance:none; - margin:0; /* <-- Apparently some margin are still there even though it's hidden */ -} - /* history table */ .table-log { table-layout:fixed; @@ -238,12 +216,19 @@ td.maps-cell { color:#005580; text-decoration:underline; } -.spinner { - background:url('../img/spinner.gif') no-repeat -100px; - } -.loading .spinner { - background-position:0 50%; - } + +/* Glyphicons animated spinners */ +.loading .glyphicon-spin { + animation: spin 1000ms infinite linear; +} +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } +} /* widget */ .widget-box { diff --git a/interface/img/spinner.gif b/interface/img/spinner.gif deleted file mode 100644 index 9ad3455731749268f1b0d41e68d89daeac2afe9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 1690 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 aJpV6r8m@&W(5a080000History diff --git a/interface/js/rspamd.js b/interface/js/rspamd.js index e5f37e6dff..f2690baf5e 100644 --- a/interface/js/rspamd.js +++ b/interface/js/rspamd.js @@ -1289,7 +1289,9 @@ $('#navBar').addClass('loading'); }); $(document).ajaxComplete(function () { - $('#navBar').removeClass('loading'); + setTimeout(function () { + $('#navBar').removeClass('loading'); + }, 1000); }); $('#status_nav').bind('click', function (e) { getChart(); -- 2.47.3