New colortheme for alertify logs and modals

This commit is contained in:
yflory
2018-04-13 17:47:33 +02:00
parent 5ee5a93513
commit 52d6c9d468
11 changed files with 51 additions and 39 deletions
+6 -5
View File
@@ -23,7 +23,7 @@ define([
UI.Alertify = Alertify;
// set notification timeout
Alertify._$$alertify.delay = AppConfig.notificationTimeout || 5000;
Alertify._$$alertify.delay = 6000000 || AppConfig.notificationTimeout || 5000;
var findCancelButton = UI.findCancelButton = function (root) {
if (root) {
@@ -557,9 +557,9 @@ define([
$loading.removeClass('cp-loading-hidden');
$('.cp-loading-spinner-container').show();
if (loadingText) {
$('#' + LOADING).find('p').text(loadingText);
$('#' + LOADING).find('p').show().text(loadingText);
} else {
$('#' + LOADING).find('p').text('');
$('#' + LOADING).find('p').hide().text('');
}
$container = $loading.find('.cp-loading-container');
} else {
@@ -610,8 +610,8 @@ define([
}
$('.cp-loading-spinner-container').hide();
$('#cp-loading-tip').remove();
if (transparent) { $('#' + LOADING).css('opacity', 0.8); }
$('#' + LOADING).find('p').html(error || Messages.error);
if (transparent) { $('#' + LOADING).css('opacity', 0.9); }
$('#' + LOADING).find('p').show().html(error || Messages.error);
if (exitable) {
$(window).focus();
$(window).keydown(function (e) {
@@ -677,6 +677,7 @@ define([
},
//arrowType: 'round',
arrowTransform: 'scale(2)',
zIndex: 100000001
});
UI.addTooltips = function () {
var MutationObserver = window.MutationObserver;
+8 -1
View File
@@ -72,6 +72,13 @@ define([], function () {
#cp-loading .cp-loading-cryptofist {
}
}
#cp-loading-message {
background: #FFF;
padding: 20px;
width: 100%;
color: #000;
display: none;
}
#cp-loading .cp-loading-spinner-container {
position: relative;
height: 100px;
@@ -120,7 +127,7 @@ define([], function () {
'<div class="cp-loading-spinner-container">',
'<span class="fa fa-circle-o-notch fa-spin fa-4x fa-fw"></span>',
'</div>',
//'<p id="cp-loading-message"></p>',
'<p id="cp-loading-message"></p>',
'</div>'
].join('');
var intr;
-5
View File
@@ -12,11 +12,6 @@
@button-border: 2px;
/*html, body {
margin: 0px;
height: 100%;
}*/
// body
display: flex;
flex-flow: column;
+2 -1
View File
@@ -36,7 +36,8 @@
line-height: 1em;
cursor: pointer;
background-color: #111;
background-color: @colortheme_modal-bg;
box-shadow: 2px 2px 5px #000;
color: @darker;
transition: all 0.1s;