Allow queries to be cancelled from the dashboards. Fixes #1812

This commit is contained in:
Murtuza Zabuawala
2017-07-24 12:13:24 +01:00
committed by Dave Page
parent fe95b7670b
commit 617e9dbb3a
6 changed files with 221 additions and 41 deletions

View File

@@ -71,7 +71,7 @@ iframe {
}
/*
* Bootstrap 3 remove submenus as they don't work overly well on Mobile. The
* Bootstrap 3 remove submenus as they don't work overly well on Mobile. The
* following CSS adds them back in - for our purposes they actually work fine
* on Mobile and are perfectly responsive
*/
@@ -570,7 +570,7 @@ fieldset[disabled] .form-control {
}
.backgrid.presentation td.renderable {
padding: 3px;
padding: 6px 3px 3px 3px;
font-size: 12px;
}
@@ -984,7 +984,7 @@ ul.nav.nav-tabs {
background-position: 0px 2px;
}
/* This rule will stop Chrome apply highlighting to elements such as DIV's used as modals */
/* This rule will stop Chrome apply highlighting to elements such as DIV's used as modals */
*:focus {
outline: none;
}
@@ -993,7 +993,7 @@ ul.nav.nav-tabs {
.alert-info-panel {
border: 2px solid #a1a1a1;
margin-top: 2em;
padding: 5px 5px;
padding: 5px 5px;
background: #dddddd;
border-radius: 5px;
height: 8em;
@@ -1334,4 +1334,4 @@ body {
color: #333;
font-size: 14px;
font-weight: normal;
}
}

View File

@@ -31,10 +31,25 @@ define([
return alert;
};
var info = function(message, timeout) {
var alertMessage = '\
<div class="media alert-info font-blue text-14">\
<div class="media-body media-middle">\
<div class="alert-icon info-icon">\
<i class="fa fa-info" aria-hidden="true"></i>\
</div>\
<div class="alert-text">' + message + '</div>\
</div>\
</div>';
var alert = alertify.notify(alertMessage, timeout);
return alert;
};
$.extend(this, {
'success': success,
'error': error,
'info': info,
});
};
return AlertifyWrapper;
});
});

View File

@@ -103,37 +103,6 @@ category: alerts
padding: 15px;
}
.alert-icon {
display: inline-block;
color: white;
padding: 15px;
width: 50px;
height: 50px;
font-size: 14px;
}
.success-icon {
background: #3a773a;
}
.error-icon {
background: #d0021b;
}
.alert-text {
display: inline-block;
padding: 0 12px 0 10px;
}
.alert-row {
display: block;
}
.alert-box {
padding: 0px;
display: inline-block;
}
.alert-icon {
display: inline-block;
color: white;
@@ -152,6 +121,10 @@ category: alerts
background: #d0021b;
}
.info-icon {
background: #2c76b4;
}
.alert-text {
display: inline-block;
padding: 0 12px 0 10px;

View File

@@ -170,6 +170,12 @@ button.pg-alertify-button {
@extend .ajs-text-smoothing;
}
.ajs-message.ajs-visible {
@extend .bg-blue-1;
@extend .border-blue-2;
@extend .ajs-text-smoothing;
}
.media-body {
display: table-row;
}
}