Skip to content

Commit 502e4ee

Browse files
committed
Show headers on macOS environment table; improve scrolling
1 parent d207490 commit 502e4ee

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

webui/src/css/app.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ h6:first-child {
441441
overflow: auto;
442442
}
443443

444+
.wkt-macos-env-variables-dialog,
444445
.wkt-macos-path-directories-dialog {
445446
width: 85%;
446447
height: 85vh;
@@ -479,6 +480,25 @@ h6:first-child {
479480
grid-column-end: 2;
480481
}
481482

483+
/* some dialogs need 100% height / width body content */
484+
485+
.wkt-fixed-body-dialog .oj-dialog-body,
486+
.wkt-fixed-body-dialog .oj-dialog-content,
487+
.wkt-fixed-body-dialog .oj-dialog-content > div {
488+
width: 100%;
489+
height: 100%;
490+
}
491+
492+
.wkt-full-height {
493+
height: 100%;
494+
overflow: auto;
495+
}
496+
497+
.wkt-macos-env-variables-dialog .oj-table {
498+
width: 100%;
499+
height: 100%;
500+
}
501+
482502
/* the oj-switcher in the code view should use the remaining height */
483503
.wkt-code-view-switcher {
484504
min-height: 1px;

webui/src/js/views/macos-environment-variables-dialog.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
Copyright (c) 2022, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
44
-->
5-
<oj-dialog id="wktMacosEnvironmentVariablesDialog" class="wkt-macos-path-directories-dialog" initial-visibility="hide">
5+
<oj-dialog id="wktMacosEnvironmentVariablesDialog" class="wkt-macos-env-variables-dialog wkt-fixed-body-dialog" initial-visibility="hide">
66
<div slot="header">
77
<span class="oj-dialog-title"><oj-bind-text value="[[labelMapper('title')]]"></oj-bind-text></span>
88
</div>
99

1010
<div slot="body">
11-
<div class="oj-panel wkt-notop">
11+
<div class="oj-panel wkt-notop wkt-full-height">
1212
<oj-table id="macos-environment-variables-table"
1313
class="wkt-env-vars-table"
1414
aria-label="Inherited Environment Variables Table"
1515
data="[[environmentVariablesDataProvider]]"
1616
display="grid"
17+
layout="fixed"
1718
horizontal-grid-visible="enabled"
1819
vertical-grid-visible="enabled"
1920
edit-mode="none"
@@ -28,7 +29,6 @@
2829
</td>
2930
</tr>
3031
</template>
31-
<template slot="headerTemplate" data-oj-as="header"></template>
3232
</oj-table>
3333
</div>
3434
</div>

webui/src/js/views/macos-path-directories-dialog.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
Copyright (c) 2022, Oracle and/or its affiliates.
33
Licensed under The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
44
-->
5-
<oj-dialog id="wktMacosPathDirectoriesDialog" class="wkt-macos-path-directories-dialog" initial-visibility="hide">
5+
<oj-dialog id="wktMacosPathDirectoriesDialog" class="wkt-macos-path-directories-dialog wkt-fixed-body-dialog" initial-visibility="hide">
66
<div slot="header">
77
<span class="oj-dialog-title"><oj-bind-text value="[[labelMapper('title')]]"></oj-bind-text></span>
88
</div>
99

1010
<div slot="body">
11-
<div class="oj-panel wkt-notop">
11+
<div class="oj-panel wkt-notop wkt-full-height">
1212
<div>
1313
<ol>
1414
<oj-bind-for-each data="[[pathDirectories]]">

0 commit comments

Comments
 (0)