From b841175af22a02dd876c910e59c243ade9a27977 Mon Sep 17 00:00:00 2001 From: Petr Balashov Date: Mon, 20 Mar 2017 16:44:35 +0100 Subject: [PATCH] added border to loading window --- gui/loading.css | 13 +++++++------ gui/loading.js | 12 ++++++++---- main.js | 4 ++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gui/loading.css b/gui/loading.css index 159870a..20b5f18 100644 --- a/gui/loading.css +++ b/gui/loading.css @@ -1,5 +1,7 @@ body { overflow: hidden !important; + border: solid 1px #ccc; + height: 300px; } .text-center { @@ -7,13 +9,8 @@ body { } .loader-block { - /* - background-image: url('loading.gif'); - background-repeat: no-repeat; - background-position: center; - */ height: 240px; - width: 400px; + width: 100%; position: absolute; top: 0; bottom: 0; @@ -23,5 +20,9 @@ body { } .pulse-loader { + position: absolute; + top: 20px; + left: -100px; margin: 80px 50px; + width: 400px !important; } \ No newline at end of file diff --git a/gui/loading.js b/gui/loading.js index c106141..d75532b 100644 --- a/gui/loading.js +++ b/gui/loading.js @@ -22,7 +22,8 @@ function Iguana_activehandle(callback) { AjaxOutputData = JSON.parse(AjaxOutputData.responseText) //console.log(AjaxOutputData); resolve(AjaxOutputData); - }).fail(function(xhr, textStatus, error) { + }) + .fail(function(xhr, textStatus, error) { // handle request failures console.log(xhr.statusText); if ( xhr.readyState == 0 ) { @@ -75,7 +76,8 @@ function GetAppConf() { // get iguana app conf console.log('== App Conf Data OutPut =='); console.log(_data); data = _data; - }).fail(function(xhr, textStatus, error) { + }) + .fail(function(xhr, textStatus, error) { // handle request failures console.log(xhr.statusText); if ( xhr.readyState == 0 ) { @@ -98,7 +100,8 @@ function EDEX_DEXnotarychains() { AjaxOutputData = JSON.parse(AjaxOutputData.responseText); //console.log(AjaxOutputData); resolve(AjaxOutputData); - }).fail(function(xhr, textStatus, error) { + }) + .fail(function(xhr, textStatus, error) { // handle request failures console.log(xhr.statusText); if ( xhr.readyState == 0 ) { @@ -159,7 +162,8 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) { window.createWindow('open'); window.hide(); } - }).fail(function(xhr, textStatus, error) { + }) + .fail(function(xhr, textStatus, error) { // handle request failures console.log(xhr.statusText); if ( xhr.readyState == 0 ) { diff --git a/main.js b/main.js index 4376c43..daf6a79 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,5 @@ -//main proc for EasyDEX GUI -//this app spawns iguana in background in nontech-mode +// main proc for EasyDEX GUI +// this app spawns iguana in background in nontech-mode const electron = require('electron'), app = electron.app,