Sync how permissions buttons UI/UX looks

cortezaproject · Sep 28, 2023 · 86c12cc · 86c12cc
1 parent ed377a7
commit 86c12cc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/client/web/admin/src/components/Apigw/CRouteList.vue b/client/web/admin/src/components/Apigw/CRouteList.vue
@@ -63,8 +63,8 @@
           v-if="canGrant"
           data-test-id="button-permissions"
           resource="corteza::system:apigw-route/*"
-          button-variant="link text-decoration-none text-dark regular-font rounded-0"
-          class="text-dark d-print-none border-0"
+          button-variant="light"
+          class="ml-1 text-dark d-print-none"
         >
           <font-awesome-icon :icon="['fas', 'lock']" />
           {{ $t('permissions') }}

diff --git a/client/web/admin/src/views/Federation/Nodes/List.vue b/client/web/admin/src/views/Federation/Nodes/List.vue
@@ -62,10 +62,13 @@
             />
           </template>
 
-          <b-dropdown-item>
+          <b-dropdown-item
+            link-class="p-0"
+          >
             <b-button
               size="sm"
               variant="link"
+              class="text-decoration-none"
               @click="openConfirmPending(n)"
             >
               <font-awesome-icon

diff --git a/client/web/admin/src/views/System/AuthClient/List.vue b/client/web/admin/src/views/System/AuthClient/List.vue
@@ -86,12 +86,13 @@
 
           <b-dropdown-item
             v-if="a.authClientID && canGrant"
+            link-class="p-0"
           >
             <c-permissions-button
               :title="a.meta.name || a.handle || a.authClientID"
               :target="a.meta.name || a.handle || a.authClientID"
               :resource="`corteza::system:auth-client/${a.authClientID}`"
-              button-variant="link text-decoration-none text-dark regular-font rounded-0"
+              button-variant="link dropdown-item text-decoration-none text-dark regular-font rounded-0"
               class="text-dark d-print-none border-0"
             >
               <font-awesome-icon :icon="['fas', 'lock']" />
@@ -101,12 +102,13 @@
 
           <b-dropdown-item
             v-if="!a.isDefault && a.canDeleteAuthClient"
+            link-class="p-0"
           >
             <c-input-confirm
               borderless
               variant="link"
               size="md"
-              button-class="text-decoration-none text-dark regular-font rounded-0"
+              button-class="dropdown-item text-decoration-none text-dark regular-font rounded-0"
               class="w-100"
               @confirmed="handleDelete(a)"
             >

diff --git a/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue b/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue
@@ -97,12 +97,13 @@
     >
       <c-permissions-button
         v-if="canGrant && exists"
-        class="text-dark px-0 mr-2"
-        button-variant="link"
+        button-variant="outline-light"
+        size="sm"
         :title="value.label || value.name || value.fieldID"
         :target="value.label || value.name || value.fieldID"
         :tooltip="$t('permissions:resources.compose.module-field.tooltip')"
         :resource="`corteza::compose:module-field/${module.namespaceID}/${module.moduleID}/${value.fieldID}`"
+        class="text-dark border-0 mr-2"
       />
 
       <c-input-confirm

diff --git a/client/web/compose/src/views/Admin/Pages/Edit.vue b/client/web/compose/src/views/Admin/Pages/Edit.vue
@@ -343,12 +343,13 @@
                     >
                       <c-permissions-button
                         v-if="page.canGrant && layout.pageLayoutID !== '0'"
-                        button-variant="link"
+                        button-variant="outline-light"
+                        size="sm"
                         :title="layout.meta.title || layout.handle || layout.pageLayoutID"
                         :target="layout.meta.title || layout.handle || layout.pageLayoutID"
                         :tooltip="$t('permissions:resources.compose.page-layout.tooltip')"
                         :resource="`corteza::compose:page-layout/${layout.namespaceID}/${layout.pageID}/${layout.pageLayoutID}`"
-                        class="text-dark px-0 mr-3"
+                        class="text-dark border-0 mr-2"
                       />
 
                       <c-input-confirm

diff --git a/lib/vue/src/components/permissions/CPermissionsButton.vue b/lib/vue/src/components/permissions/CPermissionsButton.vue
@@ -1,18 +1,9 @@
 <template>
-  <a
-    v-if="link"
-    data-test-id="link-permissions"
-    class="pointer"
-    :title="tooltip"
-    @click="onClick"
-  >
-    <font-awesome-icon :icon="['fas', 'lock']" />
-  </a>
   <b-button
-    v-else
     data-test-id="button-permissions"
     :title="tooltip"
     :variant="buttonVariant"
+    :size="size"
     @click="onClick"
   >
     <slot>
@@ -32,8 +23,9 @@ library.add(faLock)
 
 export default {
   props: {
-    link: {
-      type: Boolean,
+    size: {
+      type: String,
+      default: 'md',
     },
 
     buttonVariant: {