Skip to content
GitLab
Commit 80339127 authored by Carsten Rose's avatar Carsten Rose
Browse files

Merge branch 'alerts' into 'master' 

Alerts

See merge request !189
parents 3ef23f28 3c668263
Pipeline #2634 passed with stages
in 2 minutes and 46 seconds
Hide whitespace changes
Inline Side-by-side
javascript/src/AlertManager.js
View file @ 80339127
......@@ -31,6 +31,10 @@ var QfqNS = QfqNS || {};
this.blockingAlert = {};
this.eventEmitter = new EventEmitter();
this.regularCheck = {};
this.parent = $(".container") || $(".container-fluid");
if(this.parent.length === 0) {
this.parent = $(".container-fluid");
}
$("body").append(this.$container);
console.log("Created Alert Container");
......@@ -102,15 +106,10 @@ var QfqNS = QfqNS || {};
.addClass("blockscreenQfq")
.appendTo(this.$container);
$blockScreen.css({
'position': 'fixed',
'left': 0,
'right': 0,
'top': 0,
'z-index': 998,
'background': 'rgba(0,0,0,0.5)',
'width': '100%',
'height': Math.max($(document).height(), $(window).height()) + "px"
});
this.parent.addClass("blur");
var that = this;
this.screenBlocked = true;
......@@ -137,6 +136,7 @@ var QfqNS = QfqNS || {};
n.AlertManager.prototype.removeModalAlert = function() {
if (this.screenBlocked) {
$(".blockscreenQfq").remove();
this.parent.removeClass("blur");
clearInterval(this.regularCheck);
this.screenBlocked = false;
}
......
less/qfq-bs.css.less
View file @ 80339127
......@@ -489,6 +489,20 @@ select.qfq-locked:invalid {
border-color: #25adf1;
}
.blockscreenQfq {
position: fixed;
left: 0px;
right: 0px;
top: 0px;
z-index: 998;
filter: blur(23px);
background: rgba(255, 255, 255, 0.5);
}
.blur {
filter: blur(2px);
}
.alert-interactive p.title {
font-size: 1.5em;
margin-bottom: 0px;
......@@ -499,6 +513,11 @@ select.qfq-locked:invalid {
text-align: center;
}
.alert-interactive .table-hover>tbody>tr:hover {
color: #333;
background-image: linear-gradient(to bottom,#b9def0 0,#9acfea 100%)
}
// Code Correction
......@@ -829,7 +848,7 @@ thead.qfq-sticky th, thead.qfq-sticky td {
position: sticky;
top: 0;
background-color: white;
z-index: 1000;
z-index: 900;
}
thead.qfq-sticky td {
......
mockup/alert.html
View file @ 80339127
......@@ -8,7 +8,7 @@
<title>Alert</title>
</head>
<body>
<div class="container">
<button id="showalert1">Show Alert 1</button>
<button id="showalert2">Show Alert 2</button>
<button id="showalert3">Show Alert 3 primed</button>
......@@ -97,5 +97,6 @@ return false;
});
});
</script>
</div>
</body>
</html>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment