Merge branch 'development' of github.com:kgrgreer/foam3 into development

Author: kgrgreer

src/foam/core/auth/PermissionTableView.js

@@ -15,6 +15,8 @@ foam.CLASS({
   name: 'PermissionTableView',
   extends: 'foam.u2.Controller',
 
+  mixins: ['foam.u2.Router'],
+
   implements: [ 'foam.mlang.Expressions' ],
 
   requires: [
@@ -234,10 +236,18 @@ foam.CLASS({
       expression: function(filteredGs) {
         return filteredGs.length;
       }
+    },
+    {
+      name: 'viewTitle',
+      value: 'Permission Matrix'
     }
   ],
 
   methods: [
+    function init() {
+      this.addCrumb();
+      this.onDetach(this.stack?.setTitle(this.viewTitle$, this));
+    },
     async function initMap() {
       var self = this;
       var perms = await this.groupPermissionJunctionDAO.select();
@@ -272,10 +282,6 @@ foam.CLASS({
 
         callIf(this.showSearch, function() { this.start()
           .addClass(this.myClass('header'))
-          .start('span')
-            .style({padding: '8px'})
-            .add('Permission Matrix')
-          .end()
           .add(this.G_QUERY, ' ', this.QUERY)
         .end(); })
 

src/foam/u2/PropertyBorder.js

@@ -285,6 +285,11 @@ foam.CLASS({
       justify-content: space-between;
       gap: 0.8rem;
     }
+    ^labels {
+      display: flex;
+      flex-direction: column;
+      gap: 0.2lh;
+    }
   `,
 
   methods: [
@@ -297,6 +302,7 @@ foam.CLASS({
         start().
           addClass(this.myClass('labelHolder')).
           start().
+          addClass(this.myClass('labels')).
           add(labelSlot).
           add(supportingLabelSlot).
           end().
@@ -355,7 +361,7 @@ foam.CLASS({
           this
             .start(self.ExpandableBorder, { expanded$: self.helpEnabled$, title: self.HELP })
               .style({ 'flex-basis': '100%', width: '100%' })
-              .start('p').add(prop.help).end()
+              .start().addClass('p').add(prop.help).end()
             .end();
         });
     }

src/foam/u2/borders/ExpandableBorder.js

@@ -26,7 +26,7 @@
       background:$backgroundDefault; 
       border-radius: 4px;
       border: 1px solid $borderDefault;
-      padding: 24px;
+      padding: 12px;
     }
     ^ h6{
       padding-bottom: 12px;

src/foam/u2/dialog/InlineNotificationMessage.js

@@ -38,7 +38,7 @@
     },
     {
       name: 'INFO',
-      color: '$textBrand',
+      color: '$backgroundBrand',
       glyph: 'checkmark'
     },
     {
@@ -95,10 +95,16 @@ foam.CLASS({
       expression: function(type) {
         return (this.type && foam.CSS.returnTokenValue(this.type.color, this.cls_, this.__subContext__)) || '#FFFFFF';
       },
+      adapt: function(o,n) {
+        return foam.CSS.returnTokenValue(n, this.cls_, this.__subContext__);
+      },
       documentation: 'Border color for the view and icon background. Defaults to type color'
     },
     {
       name: 'iconColor',
+      adapt: function(o,n) {
+        return foam.CSS.returnTokenValue(n, this.cls_, this.__subContext__);
+      },
       factory: function() {
         return (this.type && foam.CSS.returnTokenValue(this.type.background, this.cls_, this.__subContext__)) || '#FFFFFF';
       },

src/foam/u2/dialog/StyledModal.js

@@ -136,7 +136,8 @@ foam.CLASS({
     {
       class: 'String',
       name: 'description'
-    }
+    },
+    'wrapper_'
   ],
 
   methods: [
@@ -155,7 +156,7 @@ foam.CLASS({
           .addClass(this.myClass('background'))
           .on('click', this.closeable ? this.close : null)
         .end()
-        .start(this.Rows)
+        .start(this.Rows, {}, this.wrapper_$)
           .addClass(this.myClass('wrapper'))
           .style({
             'max-height': this.slot(function(fullscreen, maxHeight) { return ! fullscreen ? maxHeight : ''}),
@@ -189,6 +190,10 @@ foam.CLASS({
           .end()
         .end();
     },
+    function styleWrapper() {
+      this.wrapper_.style(...arguments);
+      return this;
+    },
     function addBody() {
       return this.E().tag('', null, this.content$);
     },