From ed99e608b6a8862ae97acf3edbbdde38503876e7 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Mon, 14 Apr 2014 22:16:25 -0500 Subject: [PATCH] pjax: New loading spinner dialog --- include/staff/footer.inc.php | 4 ++-- scp/css/scp.css | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php index f7f2d5024..d112e157a 100644 --- a/include/staff/footer.inc.php +++ b/include/staff/footer.inc.php @@ -15,8 +15,8 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?> </div> <div id="overlay"></div> <div id="loading"> - <h4>Please Wait!</h4> - <p>Please wait... it will take a second!</p> + <i class="icon-spinner icon-spin icon-3x pull-left icon-light"></i> + <h1>Loading ...</h1> </div> <div class="dialog" style="display:none;width:650px;" id="popup"> <div class="body"></div> diff --git a/scp/css/scp.css b/scp/css/scp.css index ce9023b6c..dc2d76119 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -1505,17 +1505,20 @@ ul.progress li.no small {color:red;} } #loading, #upgrading { - border:1px solid #2a67ac; - padding: 10px 10px 10px 60px; + border:3px solid #777; + border-radius: 10px; + padding: 10px; width: 300px; - height: 100px; - background: rgb( 255, 255, 255) url('../images/FhHRx-Spinner.gif') 10px 50% no-repeat; + background: black url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAWUlEQVQYGY2PAQoAIAgDrQf6pf7kC2vCRlRUgrjqXFrMrI3McHdKiwhpiMrTDRL4ghL8geQIsc6EOwbMcsYXhIYyUlvTgXUeS1vzkXWG8OMRXCE0b+AJAtgB7jEc+2fs6e8AAAAASUVORK5CYII=) repeat; position: fixed; display: none; z-index: 3000; + box-shadow: 0 5px 20px #001; + vertical-align: middle; } -#loading h4, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; } +#loading h1, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; } +#loading, #upgrading * { color: white; } .non-local-image:after { background: url(../images/ost-logo.png) center center no-repeat; -- GitLab