Make permissions table scrollable, fix top border

wintercms · Sep 9, 2024 · 2d4ab1b · 2d4ab1b
1 parent a2f59bb
commit 2d4ab1b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/assets/css/builder.css b/assets/css/builder.css
@@ -287,10 +287,14 @@ html.gecko .control-filelist ul li.group{margin-right:10px}
 form.hide-secondary-tabs div.control-tabs.secondary-tabs ul.nav.nav-tabs{display:none}
 .form-group.size-quarter{width:23.5%}
 .form-group.size-three-quarter{width:73.5%}
-form[data-entity=database] div.field-datatable{position:absolute;width:100%;height:100%}
-form[data-entity=database] div.field-datatable div[data-control=table]{position:absolute;width:100%;height:100%}
-form[data-entity=database] div.field-datatable div[data-control=table] div.table-container{position:absolute;width:100%;height:100%}
-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}
+form[data-entity=database] div.field-datatable,
+form[data-entity=permissions] div.field-datatable{position:absolute;width:100%;height:100%}
+form[data-entity=database] div.field-datatable div[data-control=table],
+form[data-entity=permissions] div.field-datatable div[data-control=table]{position:absolute;width:100%;height:100%}
+form[data-entity=database] div.field-datatable div[data-control=table] div.table-container,
+form[data-entity=permissions] div.field-datatable div[data-control=table] div.table-container{position:absolute;width:100%;height:100%}
+form[data-entity=database] div.field-datatable div[data-control=table] div.table-container div.control-scrollbar,
+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}
 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)}
 .control-tabs.auxiliary-tabs{background:white}
 .control-tabs.auxiliary-tabs>ul.nav-tabs,

diff --git a/assets/less/builder.less b/assets/less/builder.less
@@ -92,9 +92,10 @@ form.hide-secondary-tabs {
     }
 }
 
-// Full height database columns table
+// Full height database columns and permissions table
 
-form[data-entity=database] {
+form[data-entity=database],
+form[data-entity=permissions] {
     div.field-datatable {
         position: absolute;
         width: 100%;
@@ -111,7 +112,7 @@ form[data-entity=database] {
                 height: 100%;
 
                 div.control-scrollbar {
-                    top: 70px;
+                    top: 72px;
                     bottom: 0;
                     position: absolute;
                     max-height: none!important;

diff --git a/classes/permissionsmodel/fields.yaml b/classes/permissionsmodel/fields.yaml
@@ -19,6 +19,8 @@ tabs:
             type: datatable
             btnAddRowLabel: winter.builder::lang.permission.btn_add_permission
             btnDeleteRowLabel: winter.builder::lang.permission.btn_delete_permission
+            dynamicHeight: true
+            height: 100
             columns:
                 permission:
                     title: winter.builder::lang.permission.column_permission_label