diff --git a/dist/main.css b/dist/main.css index 2a25d96..4c1f4fa 100644 Binary files a/dist/main.css and b/dist/main.css differ diff --git a/dist/main.js b/dist/main.js index 458a201..4cbb242 100644 Binary files a/dist/main.js and b/dist/main.js differ diff --git a/src/scripts/loadingBar.js b/src/scripts/loadingBar.js index 4ed505b..ad02e47 100755 --- a/src/scripts/loadingBar.js +++ b/src/scripts/loadingBar.js @@ -34,10 +34,9 @@ loadingBar.show = function(status, errorText) { // Modify loading loadingBar.dom() .removeClass('loading uploading error') - .addClass(status) .html('

Error: ' + errorText + '

') - .show() - .css('height', '40px'); + .addClass(status) + .show(); // Set timeout clearTimeout(loadingBar._timeout); @@ -66,6 +65,7 @@ loadingBar.show = function(status, errorText) { // Modify loading loadingBar.dom() .removeClass('loading uploading error') + .html('') .addClass('loading') .show(); @@ -87,11 +87,6 @@ loadingBar.hide = function(force) { // Move header up if (visible.header()) header.dom().removeClass('error loading'); - // Modify loading - loadingBar.dom() - .html('') - .css('height', '3px'); - // Set timeout clearTimeout(loadingBar._timeout); setTimeout(function() { loadingBar.dom().hide() }, 300); diff --git a/src/styles/_loading.scss b/src/styles/_loading.scss index f2f1eeb..616910f 100644 --- a/src/styles/_loading.scss +++ b/src/styles/_loading.scss @@ -18,10 +18,12 @@ /* Modes ------------------------------------------------*/ &.loading { + height: 3px; background-image: linear-gradient(to right, #153674 0%, #153674 47%, #2651AE 53%, #2651AE 100%); z-index: 2; } &.error { + height: 40px; background-color: #2f0d0e; background-image: linear-gradient(to right, #451317 0%, #451317 47%, #AA3039 53%, #AA3039 100%); z-index: 1;