diff --git a/javascript/src/AlertManager.js b/javascript/src/AlertManager.js index a5535db8731e2d80155f6d8ffca0af15a5409030..da75efaff30429661eefdb7cc4f554badb69a627 100644 --- a/javascript/src/AlertManager.js +++ b/javascript/src/AlertManager.js @@ -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; } diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less index 71a3eccacace52e29fecc9feb9089c023409ed9a..76cbda8a8fb5f356f1cc19ab9b0b8f45bd5f8dc9 100644 --- a/less/qfq-bs.css.less +++ b/less/qfq-bs.css.less @@ -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 { diff --git a/mockup/alert.html b/mockup/alert.html index 0fc3b52abc63e59a912276e635d80bdf503bc5d4..02db83b9eac858a9bf4711ce836ec3bf71db5287 100644 --- a/mockup/alert.html +++ b/mockup/alert.html @@ -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