Skip to content

Commit 2d4ab1b

Browse files
committed
Make permissions table scrollable, fix top border
1 parent a2f59bb commit 2d4ab1b

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

assets/css/builder.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,14 @@ html.gecko .control-filelist ul li.group{margin-right:10px}
287287
form.hide-secondary-tabs div.control-tabs.secondary-tabs ul.nav.nav-tabs{display:none}
288288
.form-group.size-quarter{width:23.5%}
289289
.form-group.size-three-quarter{width:73.5%}
290-
form[data-entity=database] div.field-datatable{position:absolute;width:100%;height:100%}
291-
form[data-entity=database] div.field-datatable div[data-control=table]{position:absolute;width:100%;height:100%}
292-
form[data-entity=database] div.field-datatable div[data-control=table] div.table-container{position:absolute;width:100%;height:100%}
293-
form[data-entity=database] div.field-datatable div[data-control=table] div.table-container div.control-scrollbar{top:70px;bottom:0;position:absolute;max-height:none !important;height:auto !important}
290+
form[data-entity=database] div.field-datatable,
291+
form[data-entity=permissions] div.field-datatable{position:absolute;width:100%;height:100%}
292+
form[data-entity=database] div.field-datatable div[data-control=table],
293+
form[data-entity=permissions] div.field-datatable div[data-control=table]{position:absolute;width:100%;height:100%}
294+
form[data-entity=database] div.field-datatable div[data-control=table] div.table-container,
295+
form[data-entity=permissions] div.field-datatable div[data-control=table] div.table-container{position:absolute;width:100%;height:100%}
296+
form[data-entity=database] div.field-datatable div[data-control=table] div.table-container div.control-scrollbar,
297+
form[data-entity=permissions] div.field-datatable div[data-control=table] div.table-container div.control-scrollbar{top:72px;bottom:0;position:absolute;max-height:none !important;height:auto !important}
294298
div.control-table .toolbar a.builder-custom-table-button:before{line-height:17px;font-size:21px;color:#323e50;margin-right:5px;top:3px;opacity:1;filter:alpha(opacity=100)}
295299
.control-tabs.auxiliary-tabs{background:white}
296300
.control-tabs.auxiliary-tabs>ul.nav-tabs,

assets/less/builder.less

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ form.hide-secondary-tabs {
9292
}
9393
}
9494

95-
// Full height database columns table
95+
// Full height database columns and permissions table
9696

97-
form[data-entity=database] {
97+
form[data-entity=database],
98+
form[data-entity=permissions] {
9899
div.field-datatable {
99100
position: absolute;
100101
width: 100%;
@@ -111,7 +112,7 @@ form[data-entity=database] {
111112
height: 100%;
112113

113114
div.control-scrollbar {
114-
top: 70px;
115+
top: 72px;
115116
bottom: 0;
116117
position: absolute;
117118
max-height: none!important;

classes/permissionsmodel/fields.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ tabs:
1919
type: datatable
2020
btnAddRowLabel: winter.builder::lang.permission.btn_add_permission
2121
btnDeleteRowLabel: winter.builder::lang.permission.btn_delete_permission
22+
dynamicHeight: true
23+
height: 100
2224
columns:
2325
permission:
2426
title: winter.builder::lang.permission.column_permission_label

0 commit comments

Comments
 (0)