diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css index 571c28466..b836322e7 100644 --- a/admin/client/dist/styles/bundle.css +++ b/admin/client/dist/styles/bundle.css @@ -7639,7 +7639,7 @@ h1{ content:"z"; } -.font-icon-cancel-circled:before{ +.font-icon-cancel-circled:before,.font-icon-disable-circled:before{ content:"Q"; } @@ -13510,7 +13510,7 @@ li.class-ErrorPage>a .jstree-pageicon{ list-style-type:none; } -.permissioncheckboxset .font-icon-cancel-circled,.permissioncheckboxset .font-icon-check-mark-circle,.permissioncheckboxsetfield_readonly .font-icon-cancel-circled,.permissioncheckboxsetfield_readonly .font-icon-check-mark-circle{ +.permissioncheckboxset .font-icon-cancel-circled,.permissioncheckboxset .font-icon-check-mark-circle,.permissioncheckboxset .font-icon-disable-circled,.permissioncheckboxsetfield_readonly .font-icon-cancel-circled,.permissioncheckboxsetfield_readonly .font-icon-check-mark-circle,.permissioncheckboxsetfield_readonly .font-icon-disable-circled{ font-size:18px; position:relative; top:2px; @@ -13524,6 +13524,10 @@ li.class-ErrorPage>a .jstree-pageicon{ color:#d40404; } +.permissioncheckboxset .font-icon-disable-circle,.permissioncheckboxsetfield_readonly .font-icon-disable-circle{ + color:#545d67; +} + .permissioncheckboxsetfield_readonly li,.permissioncheckboxset li{ margin-bottom:4px; } diff --git a/admin/client/src/styles/_fonts.scss b/admin/client/src/styles/_fonts.scss index f18e866a9..9617ff326 100644 --- a/admin/client/src/styles/_fonts.scss +++ b/admin/client/src/styles/_fonts.scss @@ -117,7 +117,8 @@ content: "\7a"; } -.font-icon-cancel-circled::before { +.font-icon-cancel-circled::before, +.font-icon-disable-circled::before { content: "\51"; } diff --git a/admin/client/src/styles/legacy/_SecurityAdmin.scss b/admin/client/src/styles/legacy/_SecurityAdmin.scss index 5744de001..9a33088f9 100644 --- a/admin/client/src/styles/legacy/_SecurityAdmin.scss +++ b/admin/client/src/styles/legacy/_SecurityAdmin.scss @@ -22,7 +22,8 @@ } .font-icon-check-mark-circle, - .font-icon-cancel-circled { + .font-icon-cancel-circled, + .font-icon-disable-circled { font-size: 18px; position: relative; top: 2px; @@ -36,6 +37,10 @@ color: $brand-danger; } + .font-icon-disable-circle { + color: $gray; + } + li { margin-bottom: 4px; diff --git a/src/Security/PermissionCheckboxSetField.php b/src/Security/PermissionCheckboxSetField.php index e7fe64122..b7357dbe4 100644 --- a/src/Security/PermissionCheckboxSetField.php +++ b/src/Security/PermissionCheckboxSetField.php @@ -238,6 +238,11 @@ class PermissionCheckboxSetField extends FormField $inheritMessage = '' . $inheritMessage . ''; $icon = ($checked) ? 'check-mark-circle' : 'cancel-circled'; + // Inherited codes are shown as a gray x + if (Permission::check('ADMIN') && $code != 'ADMIN') { + $icon = 'disable-circled'; + } + // If the field is readonly, add a span that will replace the disabled checkbox input if ($this->readonly) { $options .= "
  • "