diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss index ecb37d83..ce602ebf 100644 --- a/styles/components/_accordion_table.scss +++ b/styles/components/_accordion_table.scss @@ -150,5 +150,9 @@ flex-grow: 1; flex-basis: 0; } + + .accordion-table__item__toggler { + text-align: right; + } } } diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 5a8f123f..da78eddb 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -227,10 +227,6 @@ } } - .green { - color: $color-green; - } - .name { font-weight: bold; diff --git a/styles/core/_util.scss b/styles/core/_util.scss index cb508813..06ce6d74 100644 --- a/styles/core/_util.scss +++ b/styles/core/_util.scss @@ -46,3 +46,11 @@ @content; } } + +.green { + color: $color-green; +} + +.user-permission { + font-weight: $font-normal; +} diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html index d8e70ffd..89443b3e 100644 --- a/templates/portfolios/applications/team.html +++ b/templates/portfolios/applications/team.html @@ -46,7 +46,7 @@
- {{ "portfolios.applications.team_settings.user" | translate }} + {{ "common.name" | translate }} {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }} @@ -66,7 +66,11 @@ {% set user_info = environment_users[user.id] %} {% set user_permissions = user_info["permissions"] %} + {% macro PermissionField(value) %} + {{ value }} + {% endmacro %} +<<<<<<< HEAD
  • @@ -85,6 +89,26 @@ {% set close_html %} {{ "common.hide" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {% endset %} +======= + +
  • +
    + + {{ name }} + {{ user.full_name }} + {{ PermissionField(user_permissions["delete_access"]) }} + {{ PermissionField(user_permissions["environment_management"]) }} + {{ PermissionField(user_permissions["team_management"]) }} + + + {% set open_html %} + {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_down') }} + {% endset %} + + {% set close_html %} + {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }} + {% endset %} +>>>>>>> Style updates to portfolio team page: {{ ToggleButton( diff --git a/translations.yaml b/translations.yaml index 87027761..c0ca68f2 100644 --- a/translations.yaml +++ b/translations.yaml @@ -38,6 +38,7 @@ common: resource_names: environments: Environments choose_role: Choose a role + name: Name components: modal: close: Close