From 05bdfde059b7073a5b650385d7d956b74a6f4aa7 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 27 Nov 2019 09:47:15 -0500 Subject: [PATCH] Add v-cloack to toggle-menu component and add hover style to drop down menu items --- styles/components/_portfolio_layout.scss | 4 ++ templates/applications/fragments/members.html | 43 +++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index a931b659..0e018809 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -283,6 +283,10 @@ &:last-child { border-bottom: 0; } + + &:hover { + background-color: $color-aqua-lightest; + } } } } diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html index 6305f570..1a7bcb4a 100644 --- a/templates/applications/fragments/members.html +++ b/templates/applications/fragments/members.html @@ -133,32 +133,31 @@ {% endfor %} {% if user_can(permissions.EDIT_APPLICATION_MEMBER) -%} - -
- - {{ Icon('ellipsis')}} - - - {{ Icon('ellipsis')}} - + +
+ + {{ Icon('ellipsis')}} + + + {{ Icon('ellipsis')}} + -
- - {{ "portfolios.applications.members.menu.edit" | translate }} - - {% if invite_pending or invite_expired -%} - {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} - {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} - - {{ "portfolios.applications.members.menu.resend" | translate }} +
+ + {{ "portfolios.applications.members.menu.edit" | translate }} - {% if user_can(permissions.DELETE_APPLICATION_MEMBER) -%} - {{ 'invites.revoke' | translate }} + {% if invite_pending or invite_expired -%} + {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} + {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} + + {{ "portfolios.applications.members.menu.resend" | translate }} + + {% if user_can(permissions.DELETE_APPLICATION_MEMBER) -%} + {{ 'invites.revoke' | translate }} + {%- endif %} {%- endif %} - {%- endif %} +
- -
{%- endif %}