pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix errors from rebase

Browse Source
This commit is contained in:
dandds 2019-05-01 11:00:01 -04:00
parent 4cde4d88d1
commit 035d24f55d
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
styles/components/_accordion_table.scss
View File

@ -110,7 +110,7 @@
font-size: $small-font-size; font-size: $small-font-size;
font-weight: $font-normal; font-weight: $font-normal;
background-color: $color-gray-lightest; background-color: $color-gray-lightest;
padding: $gap*2 $gap*4 $gap*5 $gap*4; padding: $gap*2 $gap*4;
th, td { th, td {
.icon-link { .icon-link {

27
templates/portfolios/applications/team.html
View File

@ -70,26 +70,6 @@
<span class="user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</span> <span class="user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</span>
{% endmacro %} {% endmacro %}
<<<<<<< HEAD
<toggler inline-template>
<li class="accordion-table__item">
<div class="accordion-table__item-content">
<span>
{{ name }}
<span>{{ user.full_name }}</span>
<span>{{ user_permissions["delete_access"] }}</span>
<span>{{ user_permissions["environment_management"] }}</span>
<span>{{ user_permissions["team_management"] }}</span>
</span>
<span class="icon-link icon-link--large accordion-table__item__toggler">
{% set open_html %}
{{ "common.show" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
{% endset %}
{% set close_html %}
{{ "common.hide" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
{% endset %}
=======
<toggler inline-template> <toggler inline-template>
<li class="accordion-table__item"> <li class="accordion-table__item">
<div class="accordion-table__item-content"> <div class="accordion-table__item-content">
@ -108,7 +88,6 @@
{% set close_html %} {% set close_html %}
{{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }}
{% endset %} {% endset %}
>>>>>>> Style updates to portfolio team page:
{{ {{
ToggleButton( ToggleButton(
@ -122,10 +101,8 @@
{% call ToggleSection(section_name="environments") %} {% call ToggleSection(section_name="environments") %}
<ul> <ul>
{% for environment in user_info["environments"] %} {% for environment in user_info["environments"] %}
<li> <li class="accordion-table__item__expanded">
<div class="accordion-table__item-content"> {{ environment.name }}
{{ environment.name }}
</div>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>