Web application fixes for IE11
Ylian Saint-Hilaire committed
Apr 16, 2020 at 11:57 UTC
901bb6529ed82ea87b97ef7a150b7895d2948c07
3 files changed
+20
-14
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.5.1-w",
3
+ "version": "0.5.1-x",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
public/styles/style.css
+15
-1
@@ -61,6 +61,14 @@ body {
61
grid-template-areas: "header header" "nav nav" "content content" "footer footer";
62
}
63
64
+.nofooter.fullscreen.menu_stack #container {
65
+ -ms-grid-rows: 66px minmax(24px, max-content) 1fr 0px;
66
+ grid-template-rows: 66px minmax(24px, max-content) auto 0px;
67
+ -ms-grid-columns: 90px 1fr;
68
+ /*grid-template-columns: 90px repeat(auto-fit, minmax(900px, 1fr));*/
69
+ grid-template-areas: "header header" "nav nav" "content content" "footer footer";
70
+}
71
+
72
.fullscreen #container {
73
width: 100%;
74
min-width: 100%;
@@ -79,6 +87,11 @@ body {
87
grid-template-rows: 66px 24px auto 45px;
88
}
89
90
+.nofooter #container {
91
+ -ms-grid-rows: 66px 24px 1fr 0px;
92
+ grid-template-rows: 66px 24px auto 0px;
93
+}
94
+
95
.fulldesk #container {
96
width: 100%;
97
height: 100%;
@@ -294,6 +307,7 @@ body {
307
background-color: #fff;
308
/* max-height: calc(100vh - 151px); */
309
min-width: unset;
310
+ overflow: hidden;
311
}
312
313
.night #column_l {
@@ -314,7 +328,7 @@ body {
328
width: unset;
329
/* height: calc(100vh - 111px);
330
width: calc(100% - 30px); */
317
- overflow-y: auto;
331
+ overflow: hidden;
332
}
333
334
.menu_stack.fullscreen #column_l, .login #column_l, .arg_hide #column_l {
views/default.handlebars
+4
-12
@@ -812,7 +812,7 @@
812
<div id="p17BackButton" style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
813
<h1>Details - <span id=p17deviceName></span></h1>
814
</div>
815
- <div id=p17info></div>
815
+ <div id=p17info style="overflow-y:auto"></div>
816
</div>
817
<div id=p19 style="display:none">
818
<div id="p19title">
@@ -1383,17 +1383,7 @@
1383
QV('p40title', !(hide & 8));
1384
QV('p41title', !(hide & 8));
1385
//if (hide & 16) { QV('page_leftbar', false); QS('page_content').left = '0px'; }
1386
-
1387
- if (hide != 0) {
1388
- // Fix the main grid to zero-height elements we want to hide.
1389
- if (uiMode == 2) {
1390
- QS('container')['grid-template-rows'] = ((hide & 1) ? '0' : '66') + 'px fit-content(48px) auto ' + ((hide & 4) ? '0' : '45') + 'px';
1391
- QS('container')['-ms-grid-rows'] = ((hide & 1) ? '0' : '66') + 'px fit-content(48px) auto ' + ((hide & 4) ? '0' : '45') + 'px';
1392
- } else {
1393
- QS('container')['grid-template-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px';
1394
- QS('container')['-ms-grid-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px';
1395
- }
1396
- }
1386
+ if (!footerBar) { QC('body').add('nofooter'); } else { QC('body').remove('nofooter'); }
1387
1388
// Adjust height of remote desktop, files and Intel AMT
1389
// 1 = Top bar, 2 = Tool Bar, 4 = Bottom Bar, 8 = Tab Title
@@ -1435,6 +1425,8 @@
1425
}
1426
QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
1427
QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
1428
+ QS('p17info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1429
+ QS('p17info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1430
QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
1431
QS('p16events')['max-height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
1432
QS('p31events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';